diff --git a/.editorconfig b/.editorconfig
index 280943d..9343ea2 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -13,18 +13,24 @@ charset = utf-8
 end_of_line = lf
 insert_final_newline = true
 
+indent_style = tab
+indent_size = tab
+
+[*.dart]
 indent_style = space
 indent_size = 2
 
-# Matches the `shfmt` settings in our treefmt configuration.
-[*.{sh,bash}]
-indent_style = tab
+[*.nix]
+indent_style = space
+indent_size = 2
 
-[{Makefile,*.mk}]
-indent_style = tab
+[*.toml]
+indent_style = space
+indent_size = 2
 
-[*.{rs,go}]
-indent_style = tab
+[*.{yaml,yml}]
+indent_style = space
+indent_size = 2
 
 # Deliberately absent: `trim_trailing_whitespace`. It conflicts with rustfmt in
 # places (which is why the `trailing-whitespace` pre-commit hook is off too),
diff --git a/standards/editorconfig b/standards/editorconfig
index 280943d..9343ea2 100644
--- a/standards/editorconfig
+++ b/standards/editorconfig
@@ -13,18 +13,24 @@ charset = utf-8
 end_of_line = lf
 insert_final_newline = true
 
+indent_style = tab
+indent_size = tab
+
+[*.dart]
 indent_style = space
 indent_size = 2
 
-# Matches the `shfmt` settings in our treefmt configuration.
-[*.{sh,bash}]
-indent_style = tab
+[*.nix]
+indent_style = space
+indent_size = 2
 
-[{Makefile,*.mk}]
-indent_style = tab
+[*.toml]
+indent_style = space
+indent_size = 2
 
-[*.{rs,go}]
-indent_style = tab
+[*.{yaml,yml}]
+indent_style = space
+indent_size = 2
 
 # Deliberately absent: `trim_trailing_whitespace`. It conflicts with rustfmt in
 # places (which is why the `trailing-whitespace` pre-commit hook is off too),