diff --git a/home/hosts/andromache/default.nix b/home/hosts/andromache/default.nix
index 2bb7c38..345ca57 100644
--- a/home/hosts/andromache/default.nix
+++ b/home/hosts/andromache/default.nix
@@ -18,6 +18,7 @@ in
     ../../modules/git
     ../../modules/k9s.nix
     ../../modules/kitty.nix
+    ../../modules/nvim.nix
     ../../modules/ssh.nix
     ../../modules/taskwarrior.nix
     ../../modules/keepassxc.nix
diff --git a/home/hosts/astyanax/default.nix b/home/hosts/astyanax/default.nix
index 75869aa..d344de4 100644
--- a/home/hosts/astyanax/default.nix
+++ b/home/hosts/astyanax/default.nix
@@ -17,6 +17,7 @@ in
     ../../modules/git
     ../../modules/k9s.nix
     ../../modules/kitty.nix
+    ../../modules/nvim.nix
     ../../modules/ssh.nix
     ../../modules/taskwarrior.nix
     ../../modules/keepassxc.nix
diff --git a/home/modules/nvim.nix b/home/modules/nvim.nix
index 5068321..032c9aa 100644
--- a/home/modules/nvim.nix
+++ b/home/modules/nvim.nix
@@ -1,4 +1,4 @@
-{ inputs, pkgs, ... }:
+{ pkgs, inputs, ... }:
 
 {
   config = {
diff --git a/hosts/andromache/default.nix b/hosts/andromache/default.nix
index 2b094f4..c7ec510 100644
--- a/hosts/andromache/default.nix
+++ b/hosts/andromache/default.nix
@@ -89,9 +89,6 @@ in
     };
   };
 
-  environment.systemPackages = [
-    inputs.nvim.packages.x86_64-linux.nvim
-  ];
 
   services = {
     xserver = {
diff --git a/hosts/astyanax/default.nix b/hosts/astyanax/default.nix
index 5d7a599..eff62bd 100644
--- a/hosts/astyanax/default.nix
+++ b/hosts/astyanax/default.nix
@@ -75,7 +75,6 @@ in
   };
 
   environment.systemPackages = [
-    inputs.nvim.packages.x86_64-linux.nvim
     (pkgs.writeShellApplication {
       name = "wol-andromache";
       runtimeInputs = [ pkgs.wakeonlan ];
diff --git a/hosts/vm/default.nix b/hosts/vm/default.nix
index 3685b6f..4fcd54b 100644
--- a/hosts/vm/default.nix
+++ b/hosts/vm/default.nix
@@ -39,8 +39,6 @@ in
 
   secrets.username = username;
 
-  environment.systemPackages = [ inputs.nvim.packages.x86_64-linux.nvim ];
-
   disko = {
     devices.disk.main = {
       device = "/dev/vda";