diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..8c9c453
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,5 @@
+[*]
+indent_style = tab
+indent_size = 2
+trim_trailing_whitespaces = true
+insert_final_newline = true
diff --git a/modules/nixos/cli/neovim/default.nix b/modules/nixos/cli/neovim/default.nix
index 27ecafc..2a929a1 100644
--- a/modules/nixos/cli/neovim/default.nix
+++ b/modules/nixos/cli/neovim/default.nix
@@ -28,6 +28,7 @@ in
           options = {
             tabstop = 2;
             shiftwidth = 2;
+            expandtab = false;
             cursorlineopt = "screenline";
           };
 
diff --git a/modules/nixos/cli/neovim/editorconfig/default.nix b/modules/nixos/cli/neovim/editorconfig/default.nix
new file mode 100644
index 0000000..0567c7a
--- /dev/null
+++ b/modules/nixos/cli/neovim/editorconfig/default.nix
@@ -0,0 +1,3 @@
+{
+  programs.nvf.settings.vim.editorconfig.enable = true;
+}