diff --git a/modules/terminal-life/default.nix b/modules/terminal-life/default.nix
index 6bd0312f..12cdcaa7 100644
--- a/modules/terminal-life/default.nix
+++ b/modules/terminal-life/default.nix
@@ -47,7 +47,7 @@ in
         watson
       ];
 
-      programs.neovim = import ./nvim { inherit config; inherit pkgs; };
+      programs.neovim = import ./nvim { inherit config; inherit pkgs; inherit lib; };
       programs.fzf = import ./fzf { inherit config; inherit pkgs; };
       programs.zsh = import ./zsh { inherit config; inherit pkgs; inherit self; };
     };
diff --git a/modules/terminal-life/nvim/default.nix b/modules/terminal-life/nvim/default.nix
index 4df1892a..a673061c 100644
--- a/modules/terminal-life/nvim/default.nix
+++ b/modules/terminal-life/nvim/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 let
   psCfg = config.pub-solar;
   cfg = config.pub-solar.terminal-life;
@@ -17,29 +17,22 @@ in
   withRuby = true;
   withPython3 = true;
 
-  extraPackages = with pkgs; lib.mkIf (!cfg.lite) [
-    ccls
+  extraPackages = with pkgs; [
+    rnix-lsp
+    universal-ctags
+  ]
+
+  ++ lib.optionals (!cfg.lite) [
     gopls
-    nodejs
-    nodePackages.bash-language-server
-    nodePackages.dockerfile-language-server-nodejs
-    nodePackages.svelte-language-server
-    nodePackages.typescript
-    nodePackages.typescript-language-server
-    nodePackages.vim-language-server
-    nodePackages.vue-language-server
-    nodePackages.vscode-langservers-extracted
-    nodePackages.yaml-language-server
     python39Packages.python-lsp-server
     python3Full
-    solargraph
-    rnix-lsp
-    rust-analyzer
-    terraform-ls
-    universal-ctags
-  ];
+  ]
+  ;
 
   plugins = with pkgs.vimPlugins; [
+  ]
+
+  ++ lib.optionals (!cfg.lite) [
     nvim-cmp
     cmp-nvim-lsp
     cmp_luasnip