diff --git a/user/modules/bash/bash b/user/modules/bash/bash
index f0fe41e..6667f36 160000
--- a/user/modules/bash/bash
+++ b/user/modules/bash/bash
@@ -1 +1 @@
-Subproject commit f0fe41e942dfedab23828131372a5545a6d5c4c6
+Subproject commit 6667f36a9f83a88b33b691a5a9b701365267bbb3
diff --git a/user/modules/neovim/nvim b/user/modules/neovim/nvim
index 79643b1..f11e6a0 160000
--- a/user/modules/neovim/nvim
+++ b/user/modules/neovim/nvim
@@ -1 +1 @@
-Subproject commit 79643b1a17336b43f09090aa51ffc18763e11552
+Subproject commit f11e6a02db5cd8e4c8c1bdec0d34557ff995c32c
diff --git a/user/modules/neovim/pkgs.nix b/user/modules/neovim/pkgs.nix
index 1bdeb8a..04dcd86 100644
--- a/user/modules/neovim/pkgs.nix
+++ b/user/modules/neovim/pkgs.nix
@@ -1,6 +1,24 @@
 { pkgs, ... }:
 
-with pkgs; [
-  gcc
-  lazygit
-]
+let
+  # Essential LSPs for config files (project-specific LSPs go in devShells)
+  lsp = with pkgs; [
+    nixd
+    lua-language-server
+    marksman
+    taplo
+  ];
+
+  lsp' = with pkgs.nodePackages; [
+    vscode-langservers-extracted  # jsonls, html, cssls
+    bash-language-server
+    yaml-language-server
+  ];
+
+  extraPackages = with pkgs; [
+    lazygit
+    gcc
+  ];
+
+in
+  extraPackages ++ lsp ++ lsp'
diff --git a/user/modules/pi/agent b/user/modules/pi/agent
index b0524fd..4f129c8 160000
--- a/user/modules/pi/agent
+++ b/user/modules/pi/agent
@@ -1 +1 @@
-Subproject commit b0524fdd3056c7dd951b41f7da410dde37f91a67
+Subproject commit 4f129c83b945e8847df798f83a29e554570c6142
diff --git a/user/modules/vim/vim b/user/modules/vim/vim
index d5bdb39..8c8a4e4 160000
--- a/user/modules/vim/vim
+++ b/user/modules/vim/vim
@@ -1 +1 @@
-Subproject commit d5bdb39d7e65e679b3052e5ec437f75e4ec8e594
+Subproject commit 8c8a4e4a7afd175be2eb97055bb01f43ee8b992d