diff --git a/.editorconfig b/.editorconfig
index 52b84b424fb..f1eff1dffcf 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,40 +1,26 @@
 root = true
 
 [*]
-end_of_line = lf
 charset = utf-8
-trim_trailing_whitespace = true
+end_of_line = lf
+indent_size = 2
+indent_style = space
 insert_final_newline = true
+trim_trailing_whitespace = true
 
 [vcbuild.bat]
 end_of_line = crlf
 
-[{lib,test,tools}/**.js]
-indent_style = space
-indent_size = 2
-
-[src/**.{h,cc}]
-indent_style = space
-indent_size = 2
-
-[test/*.py]
-indent_style = space
-indent_size = 2
-
-[configure]
-indent_style = space
-indent_size = 2
-
 [Makefile]
-indent_style = tab
 indent_size = 8
+indent_style = tab
 
 [{deps}/**]
-indent_style = ignore
-indent_size = ignore
+charset = ignore
 end_of_line = ignore
+indent_size = ignore
+indent_style = ignore
 trim_trailing_whitespace = ignore
-charset = ignore
 
 [{test/fixtures,deps,tools/node_modules,tools/gyp,tools/icu,tools/msvs}/**]
 insert_final_newline = false