diff --git a/flake.nix b/flake.nix
index 2a7e227..87253ed 100644
--- a/flake.nix
+++ b/flake.nix
@@ -47,19 +47,9 @@
     };
 
     homeManagerModules = {
-      neovim = {pkgs, ...}: {
-        programs.neovim = {
-          enable = true;
-          defaultEditor = true;
-          vimAlias = true;
-          viAlias = true;
-          vimdiffAlias = true;
-          package = self.packages.${pkgs.system}.neovim;
-        };
-      };
+      neovim = (import ./home-manager.nix) {inherit inputs self;};
       default = self.homeManagerModules.neovim;
     };
-    homeManagerModule = self.homeManagerModules;
 
     devShells = forAllSystems (system: pkgs: {
       default = pkgs.mkShell {
diff --git a/home-manager.nix b/home-manager.nix
new file mode 100644
index 0000000..f4b255f
--- /dev/null
+++ b/home-manager.nix
@@ -0,0 +1,38 @@
+{
+  inputs,
+  self,
+}: ({
+    config,
+    pkgs,
+    lib,
+    ...
+  }:
+    with lib; let
+      neovim = pkgs.callPackage ./neovim.nix {
+        go-grip = inputs.go-grip.packages.${pkgs.system}.default;
+        yazi = config.programs.yazi.package;
+      };
+      bin = lib.getExe neovim;
+    in {
+      home.packages = [
+        neovim
+      ];
+
+      home.sessionVariables.EDITOR = mkDefault "${bin}";
+
+      programs.bash.shellAliases = {
+        vimdiff = mkDefault "${bin} -d";
+        vi = mkDefault "${bin}";
+        vim = mkDefault "${bin}";
+      };
+      programs.fish.shellAliases = {
+        vimdiff = mkDefault "${bin} -d";
+        vi = mkDefault "${bin}";
+        vim = mkDefault "${bin}";
+      };
+      programs.zsh.shellAliases = {
+        vimdiff = mkDefault "${bin} -d";
+        vi = mkDefault "${bin}";
+        vim = mkDefault "${bin}";
+      };
+    })