diff --git a/modules/neovim/default.nix b/modules/neovim/default.nix
index b423cd1d..dbe3bf45 100644
--- a/modules/neovim/default.nix
+++ b/modules/neovim/default.nix
@@ -13,9 +13,12 @@ let
 in
 {
   programs.neovim.enable = true;
+  programs.npm.enable = true;
 
   home-manager.sharedModules = [
     {
+      programs.bat.enable = true;
+
       home.packages = with pkgs; [
         go gopls
         nil alejandra nixpkgs-fmt nixfmt
@@ -27,6 +30,43 @@ in
         texlab
       ];
 
+      editorconfig = {
+        enable = true;
+
+        settings = {
+          "*" = {
+            charset = "utf-8";
+            end_of_line = "lf";
+            insert_final_newline = true;
+            indent_size = 2;
+            indent_style = "space";
+            trim_trailing_whitespace = true;
+          };
+
+          "*.md".indent_style = "tab";
+
+          "Makefile" = {
+            indent_style = "tab";
+            indent_size = 4;
+          };
+
+          "*.html" = {
+            indent_style = "tab";
+            indent_size = 4;
+          };
+
+          "*.go" = {
+            indent_style = "tab";
+            indent_size = 4;
+          };
+
+          "*.rs" = {
+            indent_style = "space";
+            indent_size = 4;
+          };
+        };
+      };
+
       programs.neovim = {
         enable = true;
         extraConfig = /* vim */ ''