diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..a360eed8
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,10 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.nix]
+indent_style = space
+indent_size = 2
diff --git a/shell.nix b/shell.nix
index 93e0dd09..896d4bc2 100644
--- a/shell.nix
+++ b/shell.nix
@@ -5,6 +5,7 @@ pkgs.mkShellNoCC {
     gnupg
     statix
     openstackclient
+    editorconfig-checker
   ];
 
   shellHook = ''