diff --git a/config/init.lua b/config/init.lua
index 3a204ed..3e97421 100644
--- a/config/init.lua
+++ b/config/init.lua
@@ -120,7 +120,6 @@ end
 }
 lspconfig.pyright.setup {}
 lspconfig.nil_ls.setup {}
-lspconfig.phpactor.setup {}
 
 -- Global mappings.
 -- See `:help vim.diagnostic.*` for documentation on any of the below functions
diff --git a/flake.nix b/flake.nix
index 70300ee..8733756 100644
--- a/flake.nix
+++ b/flake.nix
@@ -29,7 +29,6 @@
         gopls
         pyright
         nil
-        phpactor
       ];
       neovim-with-deps = recursiveMerge [
         pkgs.neovim-unwrapped
@@ -42,10 +41,10 @@
       '';
     in rec {
       packages.neovim = pkgs.wrapNeovim neovim-with-deps ({
-        viAlias = true;
+        viAlias = false;
         vimAlias = true;
         withRuby = false;
-        withPython3 = true;
+        withPython3 = false;
         extraMakeWrapperArgs = ''--prefix PATH : "${pkgs.lib.makeBinPath dependencies}"'';
         configure = {
           customRC =
@@ -57,7 +56,6 @@
           };
         };
       });
-
       apps.neovim = flake-utils.lib.mkApp {
         drv = packages.neovim; name = "neovim"; exePath = "/bin/nvim";
       };
diff --git a/plugins.nix b/plugins.nix
index e4dc663..aa4bf1c 100644
--- a/plugins.nix
+++ b/plugins.nix
@@ -7,7 +7,33 @@
     neogit
     nvim-lspconfig
     nvim-treesitter-textobjects
-    nvim-treesitter.withAllGrammars
+    (nvim-treesitter.withPlugins(p: with p; [
+      tree-sitter-bash
+      tree-sitter-c
+      tree-sitter-comment
+      tree-sitter-css
+      tree-sitter-dockerfile
+      tree-sitter-embedded-template
+      tree-sitter-go
+      tree-sitter-gomod
+      tree-sitter-hcl
+      tree-sitter-html
+      tree-sitter-javascript
+      tree-sitter-json
+      tree-sitter-lua
+      tree-sitter-make
+      tree-sitter-markdown
+      tree-sitter-markdown-inline
+      tree-sitter-nix
+      tree-sitter-php
+      tree-sitter-python
+      tree-sitter-regex
+      tree-sitter-ruby
+      tree-sitter-sql
+      tree-sitter-toml
+      tree-sitter-typescript
+      tree-sitter-yaml
+    ]))
     oil-nvim
     refactoring-nvim
     rose-pine