diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..1ec980b
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,23 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+indent_style = space
+indent_size = 2
+
+[*.{md,mdx,rst}]
+trim_trailing_whitespace = false
+
+[Makefile*]
+indent_style = tab
+indent_size = 4
+
+[*.{py,rb}]
+indent_size = 4
+
+[*.{go,java}]
+indent_style = tab
+indent_size = 4
diff --git a/.zunit.zsh b/.zunit.zsh
index e55541c..881cedd 100644
--- a/.zunit.zsh
+++ b/.zunit.zsh
@@ -1,3 +1,5 @@
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
 # ZUnit configuration
 ZUNIT_TESTS_DIR='tests'
 ZUNIT_OUTPUT_DIR='tests/_output'
diff --git a/lib/color.zsh b/lib/color.zsh
index 59c61d0..f29113e 100644
--- a/lib/color.zsh
+++ b/lib/color.zsh
@@ -1,3 +1,5 @@
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
 # Source: https://github.com/molovo/color
 # License: MIT — Copyright (c) 2015 Joe Letchford
 # Maintained by z-shell/src — https://github.com/z-shell/src
diff --git a/lib/revolver.zsh b/lib/revolver.zsh
index 906b6bc..6de932a 100644
--- a/lib/revolver.zsh
+++ b/lib/revolver.zsh
@@ -1,4 +1,6 @@
 #!/usr/bin/env zsh
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
 # Source: https://github.com/molovo/revolver
 # License: MIT — Copyright (c) 2016 Joe Letchford
 # Maintained by z-shell/src — https://github.com/z-shell/src