diff --git a/.dir-locals.el b/.dir-locals.el
deleted file mode 100644
index 3b43ed01d76a7ed3732653688c06930120345b35..0000000000000000000000000000000000000000
--- a/.dir-locals.el
+++ /dev/null
@@ -1,3 +0,0 @@
-;;; Directory Local Variables
-;;; For more information see (info "(emacs) Directory Variables")
-
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000000000000000000000000000000000..bf0dc05489d979209aba5df644113f54e322df2f
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,7 @@
+[*]
+indent_style = tab
+tab_width = 2
+insert_final_newline = true
+
+[*.{lisp,yml}]
+indent_style = space