diff --git a/home-cli.nix b/home-cli.nix
index f6fd851..13b4a42 100644
--- a/home-cli.nix
+++ b/home-cli.nix
@@ -14,10 +14,6 @@ in
     settings.experimental-features = [ "nix-command" "flakes" ];
   };
 
-  imports = [
-    ./home-nvim.nix
-  ];
-
   home.packages = with pkgs; [
     supabase-cli
     bitwarden-cli
@@ -57,6 +53,10 @@ in
     stylelint
     js-beautify
     intelephense
+    vscode-langservers-extracted
+    elixir-ls
+    lua-language-server
+    tree-sitter
     dict
     ispell
     aspell
@@ -270,4 +270,11 @@ in
     enable = true;
     keys = [ "id_rsa" "id_rsa_mr" "2B3A6377" ];
   };
+
+  programs.neovim = {
+    enable = true;
+    viAlias = true;
+    vimAlias = true;
+  };
+  xdg.configFile."nvim/init.lua".source = ./init.lua;
 }
diff --git a/home-nvim.nix b/home-nvim.nix
deleted file mode 100644
index d3e4489..0000000
--- a/home-nvim.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ pkgs, ... }:
-
-{
-  programs.neovim = {
-    enable = true;
-    viAlias = true;
-    vimAlias = true;
-  };
-
-  xdg.configFile."nvim/init.lua".source = ./init.lua;
-
-  home.packages = with pkgs; [
-    # LSP servers (others already in home-cli.nix: nixd, typescript-language-server, intelephense)
-    vscode-langservers-extracted # eslint, html, css, json
-    elixir-ls
-    lua-language-server
-
-    # Treesitter parser compilation
-    tree-sitter
-  ];
-}