diff --git a/home.nix b/home.nix
index a381c09..3adbc90 100644
--- a/home.nix
+++ b/home.nix
@@ -61,30 +61,8 @@
 
   programs.neovim =
     let
-      treesitterWithGrammars = (pkgs.vimPlugins.nvim-treesitter.withPlugins (p: [
-        p.bash
-        p.comment
-        p.css
-        p.dockerfile
-        p.fish
-        p.gitattributes
-        p.gitignore
-        p.go
-        p.gomod
-        p.gowork
-        p.javascript
-        p.json5
-        p.json
-        p.lua
-        p.make
-        p.markdown
-        p.nix
-        p.python
-        p.rust
-        p.toml
-        p.typescript
-        p.yaml
-      ]));
+      nvim-treesitter = pkgs.vimPlugins.nvim-treesitter;
+      treesitterWithGrammars = (nvim-treesitter.withPlugins (_: nvim-treesitter.allGrammars));
 
       treesitter-parsers = pkgs.symlinkJoin {
         name = "treesitter-parsers";
@@ -103,6 +81,11 @@
 
         vim.opt.runtimepath:append ("${treesitter-parsers}")
       '';
+      extraPackages = with pkgs; [
+        lua-language-server
+        rust-analyzer-unwrapped
+        nil
+      ];
 
       plugins = [
         treesitterWithGrammars