diff --git a/editorconfig b/editorconfig
index 84d0c199..e3b19b05 100644
--- a/editorconfig
+++ b/editorconfig
@@ -9,8 +9,11 @@ charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 
-[*.md]
-trim_trailing_whitespace
+[*.{rb,lua,yml,yaml,json,toml}]
+indent_size = 2
+
+[*.go]
+indent_style = tab
 
 [Makefile]
 indent_style = tab