diff --git a/.editorconfig b/.editorconfig
index 66874fc856e6e398f35486e1538db8091a70d727..8c9ed68c228df0539dc8bfbbc4ee7b8e1f945adb 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -4,5 +4,13 @@ root = true
 
 [*]
 end_of_line = lf
+indent_size = 4
+indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
+
+[*.{graphql,js,json,nix,ts,tsx,yaml,yml}]
+indent_size = 2
+
+[{Makefile,go.mod,go.sum,*.go}]
+indent_style = tab