From e1886010532c5008e2d0e42c604282e3f23f30da Mon Sep 17 00:00:00 2001
From: Eryn Wells <eryn@erynwells.me>
Date: Sun, 25 Jan 2026 17:44:44 -0800
Subject: [PATCH] [nvim] Update lsp config after deprecation of lspconfig
 module

---
 nvim/after/plugin/treesitter.lua |  4 ++--
 nvim/lua/lsp.lua                 | 30 ++++++++++++++----------------
 nvim/lua/treesitter.lua          |  2 +-
 3 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/nvim/after/plugin/treesitter.lua b/nvim/after/plugin/treesitter.lua
index 4f9ee81..f1ebcef 100644
--- a/nvim/after/plugin/treesitter.lua
+++ b/nvim/after/plugin/treesitter.lua
@@ -1,6 +1,6 @@
-local treesitter_configs = require 'nvim-treesitter.configs'
+local treesitter = require 'nvim-treesitter'
 
-treesitter_configs.setup {
+treesitter.setup {
     ensure_installed = { "lua", "vim" },
     sync_install = true,
     auto_install = true,
diff --git a/nvim/lua/lsp.lua b/nvim/lua/lsp.lua
index 8c6f913..0a4277d 100644
--- a/nvim/lua/lsp.lua
+++ b/nvim/lua/lsp.lua
@@ -3,8 +3,6 @@
 
 local clangd_extensions = require 'clangd_extensions'
 local cmp = require 'cmp'
-local lspconfig = require 'lspconfig'
-
 local keys = require 'keys'
 
 cmp.setup {
@@ -60,7 +58,7 @@ local function on_attach(client, buffer_number)
     keys.init_lsp_key_mappings(buffer_number)
 end
 
-lspconfig.clangd.setup {
+vim.lsp.config("clangd", {
     on_attach = function(client, buffer_number)
         on_attach(client, buffer_number)
 
@@ -69,24 +67,24 @@ lspconfig.clangd.setup {
         clangd_inlay_hints.set_inlay_hints()
     end,
     capabilities = cmp_capabilities,
-}
+})
 
-lspconfig.eslint.setup {
+vim.lsp.config("eslint", {
     on_attach = on_attach,
     capabilities = cmp_capabilities,
-}
+})
 
-lspconfig.ts_ls.setup {
+vim.lsp.config("ts_ls", {
     on_attach = on_attach,
     capabilities = cmp_capabilities,
-}
+})
 
-lspconfig.html.setup {
+vim.lsp.config("html", {
     on_attach = on_attach,
     capabilities = cmp_capabilities,
-}
+})
 
-lspconfig.lua_ls.setup {
+vim.lsp.config("lua_ls", {
     on_attach = on_attach,
     capabilities = cmp_capabilities,
     settings = {
@@ -101,14 +99,14 @@ lspconfig.lua_ls.setup {
             },
         },
     },
-}
+})
 
-lspconfig.pyright.setup {
+vim.lsp.config("pyright", {
     on_attach = on_attach,
     capabilities = cmp_capabilities,
-}
+})
 
-lspconfig.rust_analyzer.setup {
+vim.lsp.config("rust_analyzer", {
     on_attach = function(client, buffer_number)
         on_attach(client, buffer_number)
     end,
@@ -139,4 +137,4 @@ lspconfig.rust_analyzer.setup {
             },
         },
     },
-}
+})
diff --git a/nvim/lua/treesitter.lua b/nvim/lua/treesitter.lua
index 3c198f1..c9cb59f 100644
--- a/nvim/lua/treesitter.lua
+++ b/nvim/lua/treesitter.lua
@@ -1,7 +1,7 @@
 -- Treesitter configuration
 -- Eryn Wells <eryn@erynwells.me>
 
-local treesitter = require 'nvim-treesitter.configs'
+local treesitter = require 'nvim-treesitter'
 
 -- For some reason the Lua linter complains about missing fields here even
 -- though they're not requried. So, ignore the error.