diff --git a/.editorconfig b/.editorconfig
index b8dcb80..1e37c26 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -27,3 +27,11 @@ end_of_line = unset
 charset = unset
 trim_trailing_whitespace = unset
 insert_final_newline = unset
+
+# Shell
+[*.sh]
+indent_size = 2
+
+# YAML
+[*.{yml,yaml}]
+indent_size = 2
diff --git a/.gitattributes b/.gitattributes
index 44032b9..4b295b6 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -55,3 +55,17 @@
 *.pyc   binary
 *.pyo   binary
 *.pyd   binary
+
+# Shell
+*.sh    text diff=bash
+
+# YAML
+*.yml   text
+*.yaml  text
+
+# Configuration and lock files
+*.toml  text
+*.lock  text
+
+# Plain text
+*.txt   text