diff --git a/modules/coding/editor/neovim/default.nix b/modules/coding/editor/neovim/default.nix
index 21f2825..d2ca62b 100644
--- a/modules/coding/editor/neovim/default.nix
+++ b/modules/coding/editor/neovim/default.nix
@@ -26,32 +26,9 @@ lib.my.makeHomeProgramConfig {
         vimAlias = true;
         vimdiffAlias = true;
         extraPackages = with pkgs; [
-          gcc
-          gnumake
+          gcc # treesitter
 
-          pyright
-
-          clang-tools
-
-          rust-analyzer
-          pest-ide-tools
-
-          nixd
-
-          gotools
-          gopls
-
-          stylua
-          lua-language-server
-
-          nodePackages.typescript-language-server
-          vue-language-server
-          typescript
-          nodejs
-
-          java-language-server
-
-          ripgrep
+          ripgrep # telescope
         ];
       };
     };
diff --git a/modules/coding/langs/go.nix b/modules/coding/langs/go.nix
index 3331e85..23fbb54 100644
--- a/modules/coding/langs/go.nix
+++ b/modules/coding/langs/go.nix
@@ -14,6 +14,10 @@ lib.my.makeHomePackageConfig {
     "go"
   ];
   extraConfig = {
+    my.home.home.packages = with pkgs; [
+      gotools
+      gopls
+    ];
     my.persist.homeDirs = [
       "go"
     ];
diff --git a/modules/coding/langs/java.nix b/modules/coding/langs/java.nix
index 7393b41..b8ac3f1 100644
--- a/modules/coding/langs/java.nix
+++ b/modules/coding/langs/java.nix
@@ -15,6 +15,7 @@ lib.my.makeSwitch {
   config' = {
     my.home.home.packages = with pkgs; [
       openjdk24
+      java-language-server
     ];
   };
 }
diff --git a/modules/coding/langs/js.nix b/modules/coding/langs/js.nix
index c64902f..249faa8 100644
--- a/modules/coding/langs/js.nix
+++ b/modules/coding/langs/js.nix
@@ -16,8 +16,10 @@ lib.my.makeSwitch {
     my.home = {
       home.packages = with pkgs; [
         nodejs
-
         typescript
+
+        nodePackages.typescript-language-server
+        vue-language-server
       ];
       home.file.".npmrc".text = ''
         prefix = ''${HOME}/.npm-global
diff --git a/modules/coding/langs/lua.nix b/modules/coding/langs/lua.nix
index e75fac1..528a4aa 100644
--- a/modules/coding/langs/lua.nix
+++ b/modules/coding/langs/lua.nix
@@ -15,6 +15,8 @@ lib.my.makeSwitch {
   config' = {
     my.home.home.packages = with pkgs; [
       luajit
+      stylua
+      lua-language-server
     ];
   };
 }
diff --git a/modules/coding/langs/python.nix b/modules/coding/langs/python.nix
index c2b2467..7aab5c9 100644
--- a/modules/coding/langs/python.nix
+++ b/modules/coding/langs/python.nix
@@ -16,6 +16,7 @@ lib.my.makeHomePackageConfig {
   extraConfig = {
     my.home.home.packages = with pkgs; [
       uv
+      pyright
     ];
   };
 }
diff --git a/modules/coding/langs/rust.nix b/modules/coding/langs/rust.nix
index a30f759..c2ec062 100644
--- a/modules/coding/langs/rust.nix
+++ b/modules/coding/langs/rust.nix
@@ -21,8 +21,11 @@ lib.my.makeSwitch {
           "rust-src"
           "rustc"
           "rustfmt"
+          "rust-analyzer"
         ])
         evcxr # rust repl
+
+        pest-ide-tools
       ];
       home.file.".cargo/config.toml".text = ''
         [source.crates-io]
diff --git a/modules/nix.nix b/modules/nix.nix
index 1952041..dc33ddf 100644
--- a/modules/nix.nix
+++ b/modules/nix.nix
@@ -61,6 +61,8 @@ lib.my.makeSwitch {
       !include ${config.sops.secrets.nix-github-token.path}
     '';
 
+    my.home.home.packages = [ pkgs.nixd ];
+
     # uncomment to enable auto gc
     /*
       nix.gc = {