diff --git a/common/module.nix b/common/module.nix
index cd95752..5eb9ebf 100644
--- a/common/module.nix
+++ b/common/module.nix
@@ -13,6 +13,7 @@ in
   imports = [
     ./package-set.nix
     ./shell
+    ./nixvim.nix
     ./ssh.nix
     ./nix.nix
     ./verify-system
@@ -98,7 +99,6 @@ in
         inputs.nix-search-cli.packages.${pkgs.system}.default
         inputs.nix-inspect.packages.${pkgs.system}.default
       ];
-    vacu.nixvimPkg = self.packages.${pkgs.system}.nixvim;
     vacu.versionId = toString (self.shortRev or self.dirtyShortRev);
     vacu.versionInfo = {
       id = self.rev or self.dirtyRev;
diff --git a/common/nixvim.nix b/common/nixvim.nix
new file mode 100644
index 0000000..a1f4dc3
--- /dev/null
+++ b/common/nixvim.nix
@@ -0,0 +1,8 @@
+{ pkgs, ... }: {
+  vacu.nixvimPkg = self.packages.${pkgs.system}.nixvim;
+  vacu.packages = [
+    (writeShellFunction "nvim-plain" ''${pkgs.neovim}/bin/nvim "$@"'')
+    (writeShellFunction "nvim-nixvim" ''${config.vacu.nixvimPkg}/bin/nvim "$@"'')
+    (writeShellFunction "nvim" ''nvim-nixvim "$@"'')
+  ];
+}
diff --git a/common/shell/not-aliases.nix b/common/shell/not-aliases.nix
index 9b53c76..6a1c6a7 100644
--- a/common/shell/not-aliases.nix
+++ b/common/shell/not-aliases.nix
@@ -45,8 +45,5 @@ in
       mkdir "''${args[@]}" && cd "''${args[-1]}"
     '')
     (writeShellFunction "td" ''pushd $(mktemp "$@")'')
-    (writeShellFunction "nvim-plain" ''${pkgs.neovim}/bin/nvim "$@"'')
-    (writeShellFunction "nvim-nixvim" ''${config.vacu.nixvimPkg}/bin/nvim "$@"'')
-    (writeShellFunction "nvim" ''nvim-plain "$@"'')
   ];
 }
diff --git a/nixvim/default.nix b/nixvim/default.nix
index 5f6577b..483d77b 100644
--- a/nixvim/default.nix
+++ b/nixvim/default.nix
@@ -2,6 +2,12 @@
 let
 in
 {
+  opts = {
+    smartindent = true;
+    expandtab = true;
+    shiftwidth = 2;
+    softtabstop = -1;
+  };
   plugins.comment.enable = true;
   plugins.surround.enable = true;
   plugins.lsp = {