diff --git a/nixos/core/programs.nix b/nixos/core/programs.nix
index 5866329..a23849c 100644
--- a/nixos/core/programs.nix
+++ b/nixos/core/programs.nix
@@ -8,5 +8,6 @@
 }: {
   imports = [
     ./programs/yazi.nix
+    ./programs/neovim.nix
   ];
 }
diff --git a/nixos/core/programs/neovim.nix b/nixos/core/programs/neovim.nix
new file mode 100644
index 0000000..6df055c
--- /dev/null
+++ b/nixos/core/programs/neovim.nix
@@ -0,0 +1,18 @@
+{
+  inputs,
+  lib,
+  config,
+  pkgs,
+  unstablePkgs,
+  ...
+}: {
+  programs.neovim = {
+    enable = true;
+    defaultEditor = true;
+    viAlias = true;
+    vimAlias = true;
+    withPython3 = true;
+    withNodeJs = true;
+    withRuby = true;
+  };
+}
diff --git a/nixos/homeserver.nix b/nixos/homeserver.nix
index eca4412..94f9a52 100644
--- a/nixos/homeserver.nix
+++ b/nixos/homeserver.nix
@@ -176,16 +176,6 @@
     unstablePkgs.yazi
   ];
 
-  programs.neovim = {
-    enable = true;
-    defaultEditor = true;
-    viAlias = true;
-    vimAlias = true;
-    withPython3 = true;
-    withNodeJs = true;
-    withRuby = true;
-  };
-
   # Enable the OpenSSH daemon and other remote tools.
   services.openssh = {
     enable = true;
diff --git a/nixos/worklaptop.nix b/nixos/worklaptop.nix
index bfe9cd5..aa7454c 100644
--- a/nixos/worklaptop.nix
+++ b/nixos/worklaptop.nix
@@ -276,15 +276,6 @@
     enable = true;
     extraOptions = ["--unsupported-gpu"];
   };
-  programs.neovim = {
-    enable = true;
-    defaultEditor = true;
-    viAlias = true;
-    vimAlias = true;
-    withPython3 = true;
-    withNodeJs = true;
-    withRuby = true;
-  };
   programs.waybar.enable = true;
 
   # Enable my preferred DE utilities