diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..e3c468cb
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,20 @@
+root = true
+
+[*]
+# Future: https://github.com/editorconfig/editorconfig/issues/89
+end_of_line = lf
+trim_trailing_whitespace = true
+insert_final_newline = true
+charset = utf-8
+indent_style = space
+indent_size = 4
+
+# specific to Mikaela/shell-things
+[gitconfig]
+indent_style = tab
+
+[.{git*,mailmap}]
+indent_style = tab
+
+[*.{reg,bat,ahk}]
+end_of_line = crlf
diff --git a/Windows/.editorconfig b/Windows/.editorconfig
new file mode 100644
index 00000000..d10265b7
--- /dev/null
+++ b/Windows/.editorconfig
@@ -0,0 +1,4 @@
+root = false
+
+[*]
+end_of_line = crlf