diff --git a/.editorconfig b/.editorconfig
index 478b03e9..892334f8 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,5 +1,15 @@
-[*.{yaml,sh,gn_args}]
-tab_width = 2
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
 indent_size = 2
-end_of_line = crlf
-indent_style = space
\ No newline at end of file
+indent_style = space
+insert_final_newline = true
+
+[*.sh]
+indent_size = 4
+indent_style = space
+
+[*.patch]
+insert_final_newline = false