diff --git a/home/apps/neovim.nix b/home/apps/neovim.nix
index 4c2fa3a..7a8253b 100644
--- a/home/apps/neovim.nix
+++ b/home/apps/neovim.nix
@@ -68,11 +68,8 @@
       nodePackages.graphql
       nodePackages.graphql-language-service-cli
       nodePackages.intelephense
-      nodePackages.typescript
       nodePackages.typescript-language-server
-      nodePackages.vscode-css-languageserver-bin
-      nodePackages.vscode-html-languageserver-bin
-      nodePackages.vscode-json-languageserver-bin
+      nodePackages.vscode-langservers-extracted
       nodePackages.yaml-language-server
       yarn
 
diff --git a/home/apps/neovim/lazy-lock.json b/home/apps/neovim/lazy-lock.json
index 719e300..9c637f2 100644
--- a/home/apps/neovim/lazy-lock.json
+++ b/home/apps/neovim/lazy-lock.json
@@ -26,7 +26,7 @@
   "guihua.lua": { "branch": "master", "commit": "ab8b1f09603cc268770efd057115035dc6cfa83d" },
   "headlines.nvim": { "branch": "master", "commit": "ddef41b2664f0ce25fe76520d708e2dc9dfebd70" },
   "indent-blankline.nvim": { "branch": "master", "commit": "7075d7861f7a6bbf0de0298c83f8a13195e6ec01" },
-  "lazy.nvim": { "branch": "main", "commit": "f8611632d0f9c6818e8eb54f9bcd1dad122b5a7f" },
+  "lazy.nvim": { "branch": "main", "commit": "0d61488b89a570415177f75a36ef93616aac6c77" },
   "lightspeed.nvim": { "branch": "main", "commit": "299eefa6a9e2d881f1194587c573dad619fdb96f" },
   "lsp-status.nvim": { "branch": "master", "commit": "54f48eb5017632d81d0fd40112065f1d062d0629" },
   "lspkind.nvim": { "branch": "master", "commit": "57610d5ab560c073c465d6faf0c19f200cb67e6e" },
diff --git a/home/apps/neovim/lua/lsp/null-ls.lua b/home/apps/neovim/lua/lsp/null-ls.lua
index c1518d9..fccd07e 100644
--- a/home/apps/neovim/lua/lsp/null-ls.lua
+++ b/home/apps/neovim/lua/lsp/null-ls.lua
@@ -25,6 +25,7 @@ null.setup({
         "astro",
       },
     }),
+    null.builtins.formatting.rustfmt,
     null.builtins.formatting.shfmt,
     null.builtins.formatting.stylua,
     null.builtins.formatting.taplo,
diff --git a/home/apps/neovim/lua/lsp/validation.lua b/home/apps/neovim/lua/lsp/validation.lua
index 3cd6496..efddd78 100644
--- a/home/apps/neovim/lua/lsp/validation.lua
+++ b/home/apps/neovim/lua/lsp/validation.lua
@@ -8,7 +8,6 @@ local M = {}
 
 M.setup = function(opts)
   lspconfig.jsonls.setup(vim.tbl_extend("keep", {
-    cmd = { "json-languageserver", "--stdio" },
     settings = {
       json = {
         schemas = require("schemastore").json.schemas(),
diff --git a/home/apps/neovim/lua/lsp/webdev.lua b/home/apps/neovim/lua/lsp/webdev.lua
index 206a418..9be6894 100644
--- a/home/apps/neovim/lua/lsp/webdev.lua
+++ b/home/apps/neovim/lua/lsp/webdev.lua
@@ -8,9 +8,7 @@ local M = {}
 
 M.setup = function(opts)
   lspconfig.astro.setup(opts)
-  lspconfig.cssls.setup(vim.tbl_extend("keep", {
-    cmd = { "css-languageserver", "--stdio" },
-  }, opts))
+  lspconfig.cssls.setup(opts)
   lspconfig.emmet_ls.setup(opts)
   lspconfig.graphql.setup(vim.tbl_extend("keep", {
     filetypes = {
@@ -20,9 +18,7 @@ M.setup = function(opts)
       "typescript",
     },
   }, opts))
-  lspconfig.html.setup(vim.tbl_extend("keep", {
-    cmd = { "html-languageserver", "--stdio" },
-  }, opts))
+  lspconfig.html.setup(opts)
   lspconfig.intelephense.setup(opts)
   lspconfig.tailwindcss.setup(vim.tbl_extend("keep", {
     filetypes = {
diff --git a/home/apps/neovim/lua/plugins/tree-sitter.lua b/home/apps/neovim/lua/plugins/tree-sitter.lua
index 0922ef4..414208c 100644
--- a/home/apps/neovim/lua/plugins/tree-sitter.lua
+++ b/home/apps/neovim/lua/plugins/tree-sitter.lua
@@ -6,7 +6,6 @@ return {
       require("nvim-treesitter.install").update()
     end,
     config = function()
-      require("nvim-treesitter.install").prefer_git = true
       require("nvim-treesitter.configs").setup({
         auto_install = true,
         ignore_install = {