diff --git a/flake.nix b/flake.nix
index 4ee075a..2a7e227 100644
--- a/flake.nix
+++ b/flake.nix
@@ -42,15 +42,7 @@
     legacyPackages = self.packages;
 
     nixosModules = {
-      neovim = {pkgs, ...}: {
-        programs.neovim = {
-          enable = true;
-          defaultEditor = true;
-          vimAlias = true;
-          viAlias = true;
-          package = self.packages.${pkgs.system}.neovim;
-        };
-      };
+      neovim = (import ./home-manager.nix) {inherit inputs self;};
       default = self.nixosModules.neovim;
     };
 
diff --git a/nixos.nix b/nixos.nix
new file mode 100644
index 0000000..7c38433
--- /dev/null
+++ b/nixos.nix
@@ -0,0 +1,25 @@
+{
+  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 {
+      environment.systemPackages = [
+        neovim
+        (pkgs.writeShellScriptBin "vi" ''${bin} "$@"'')
+        (pkgs.writeShellScriptBin "vim" ''${bin} "$@"'')
+      ];
+
+      environment.variables.EDITOR = mkDefault "${bin}";
+      environment.pathsToLink = ["/share/nvim"];
+    })