diff --git a/.editorconfig b/.editorconfig
index 11a2cc6..00f3dd5 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,4 +1,22 @@
-[PKGBUILD]
+root = true
+
+[*]
 end_of_line = lf
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[PKGBUILD]
 indent_style = space
 indent_size = 2
+
+[*.json]
+indent_style = tab
+tab_width = 4
+insert_final_newline = false
+
+[*.fish]
+indent_style = space
+indent_size = 4
+
+[*.service]
+insert_final_newline = false