diff --git a/.editorconfig b/.editorconfig
index 3bc651366..e0fb20e78 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,14 +1,28 @@
 root = true
 
 [*]
+indent_style = space
 end_of_line = lf
 
-[*.py]
-indent_style = space
+[*.{bzl,bazel}]
 indent_size = 4
-wrap_width = 80
 
-[*.{hpp,hxx,h,cpp,cxx,cc,c}]
-indent_style = space
+[*.{h,hpp,hxx,cpp,cxx,cc,c}]
 indent_size = 2
 wrap_width = 90
+
+[*.html]
+indent_size = 2
+
+[*.java]
+indent_size = 2
+
+[*.proto]
+indent_size = 2
+
+[*.{py,pyx,pxd,pxi}]
+indent_size = 4
+wrap_width = 79
+
+[*.sh]
+indent_size = 2