diff --git a/modules/users/john.nix b/modules/users/john.nix
index ab8d5cc..e37bd92 100644
--- a/modules/users/john.nix
+++ b/modules/users/john.nix
@@ -31,7 +31,10 @@ in
 
     # This module will be imported by the user factory
     homeManager."${username}" = { pkgs, ... }:
-      with inputs.self.meta.users."${username}"; {
+      with inputs.self.meta.users."${username}";
+      let
+        selfPkgs = inputs.self.packages.${pkgs.stdenv.hostPlatform.system};
+      in {
         home.stateVersion = "25.11";
         imports = [
           inputs.self.modules.homeManager.shell-tools
@@ -39,8 +42,18 @@ in
           inputs.self.modules.homeManager.git
         ];
         xdg.enable = true;
+        home.packages = [
+          selfPkgs.neovim-min
+        ];
+        home.sessionVariables = {
+          EDITOR = "nvim";
+          VISUAL = "nvim";
+          GIT_EDITOR = "nvim";
+          SOPS_EDITOR = "nvim";
+        };
         programs.git.settings.user.name = name;
         programs.git.settings.user.email = email;
+        programs.git.settings.core.editor = "nvim";
       };
   };
 }