diff --git a/cli/home.nix b/cli/home.nix
index 2a4b58d..18b88a3 100644
--- a/cli/home.nix
+++ b/cli/home.nix
@@ -5,6 +5,7 @@
     ./git.nix
     ./tmux.nix
     ./nvim.nix
+    ./languages.nix
     ./pi-coding-agent.nix
   ];
 }
diff --git a/cli/languages.nix b/cli/languages.nix
new file mode 100644
index 0000000..5c52cf0
--- /dev/null
+++ b/cli/languages.nix
@@ -0,0 +1,10 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    rustc
+    cargo
+    clippy
+    nodejs
+    python3
+  ];
+}
diff --git a/cli/nvim.nix b/cli/nvim.nix
index a6993ee..c095c9c 100644
--- a/cli/nvim.nix
+++ b/cli/nvim.nix
@@ -3,12 +3,20 @@
   home.packages = with pkgs; [
     inputs.neovimBTW.packages.${pkgs.stdenv.hostPlatform.system}.nvim
 
-    nil # nix LSP
     nodejs
-    stylua
+
+    nil
+    rust-analyzer
     lua-language-server
-    vscode-langservers-extracted
+    svelte-language-server
     luajitPackages.luacheck
+    typescript-language-server
+    tailwindcss-language-server
+    vscode-langservers-extracted
+
+    stylua
+    rustfmt
+    prettierd
   ];
 
   home.sessionVariables = {