From c506d8b02296b8a42c39ea0a10c1a951ca85f76e Mon Sep 17 00:00:00 2001
From: Matt <matt@threlfall.dev>
Date: Mon, 22 Sep 2025 13:50:39 +0100
Subject: [PATCH] Revert "feat: Update config to nvim v0.11 lspconfig"

This reverts commit 4131381b91d3226b76ce93b0703509bc65bb1c49.
---
 nvim/.config/nvim/lazy-lock.json            | 10 ++++-----
 nvim/.config/nvim/lua/configs/lspconfig.lua | 25 ++++++++++-----------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json
index 3f2be99..90d5e75 100644
--- a/nvim/.config/nvim/lazy-lock.json
+++ b/nvim/.config/nvim/lazy-lock.json
@@ -1,7 +1,7 @@
 {
   "LuaSnip": { "branch": "master", "commit": "b3104910bb5ebf40492aadffae18f2528fa757d9" },
   "NvChad": { "branch": "v2.5", "commit": "b5b38ebee53bcc8b71a917916ce61504ffffd509" },
-  "base46": { "branch": "v3.0", "commit": "c3ee258239801e88eb6cd04c596cc292c88b91e5" },
+  "base46": { "branch": "v3.0", "commit": "390bbb6cf149dc9da1a91548598c809f62fbc3c6" },
   "cmp-async-path": { "branch": "main", "commit": "0ed1492f59e730c366d261a5ad822fa37e44c325" },
   "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "bd5a7d6db125d4654b50eeae9f5217f24bb22fd3" },
@@ -24,19 +24,19 @@
   "nvim-dap-go": { "branch": "main", "commit": "b4421153ead5d726603b02743ea40cf26a51ed5f" },
   "nvim-dap-python": { "branch": "master", "commit": "bfe572e4458e0ac876b9539a1e9f301c72db8ea0" },
   "nvim-dap-ui": { "branch": "master", "commit": "cf91d5e2d07c72903d052f5207511bf7ecdb7122" },
-  "nvim-lspconfig": { "branch": "master", "commit": "1f7fbc34e6420476142b5cc85e9bee52717540fb" },
+  "nvim-lspconfig": { "branch": "master", "commit": "d9879110d0422a566fa01d732556f4d5515e1738" },
   "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
   "nvim-tree.lua": { "branch": "master", "commit": "e179ad2f83b5955ab0af653069a493a1828c2697" },
   "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
   "nvim-web-devicons": { "branch": "master", "commit": "6e51ca170563330e063720449c21f43e27ca0bc1" },
   "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
-  "render-markdown.nvim": { "branch": "main", "commit": "67f2c7c8850bb11eefa6b22054a6f4cef1146de2" },
+  "render-markdown.nvim": { "branch": "main", "commit": "5f437a26a8a8b964eff683dd6f68bc2a0d38c5db" },
   "rust.vim": { "branch": "master", "commit": "889b9a7515db477f4cb6808bef1769e53493c578" },
   "rustaceanvim": { "branch": "master", "commit": "e9c5aaba16fead831379d5f44617547a90b913c7" },
-  "sonarlint.nvim": { "branch": "main", "commit": "dc5702556f90eedce587233f3c1a0ae671ea3648" },
+  "sonarlint.nvim": { "branch": "main", "commit": "5c3e0bb647be90cec844022991f33d50b6838964" },
   "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
   "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
-  "ui": { "branch": "v3.0", "commit": "532d566190391f2ddc388a5b1093b0f227366e87" },
+  "ui": { "branch": "v3.0", "commit": "4852e04faefbba3a18cb197b76ac00f4bc2e615f" },
   "volt": { "branch": "main", "commit": "620de1321f275ec9d80028c68d1b88b409c0c8b1" },
   "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }
 }
diff --git a/nvim/.config/nvim/lua/configs/lspconfig.lua b/nvim/.config/nvim/lua/configs/lspconfig.lua
index 9901ae8..29d50a4 100644
--- a/nvim/.config/nvim/lua/configs/lspconfig.lua
+++ b/nvim/.config/nvim/lua/configs/lspconfig.lua
@@ -1,8 +1,7 @@
 -- load defaults i.e lua_lsp
 require("nvchad.configs.lspconfig").defaults()
 
-local lspconfig = vim.lsp.config
-local lsputil = require("lspconfig.util")
+local lspconfig = require("lspconfig")
 
 -- EXAMPLE
 local servers = { "html", "cssls" }
@@ -10,14 +9,14 @@ local nvlsp = require("nvchad.configs.lspconfig")
 
 -- lsps with default config
 for _, lsp in ipairs(servers) do
-	lspconfig(lsp, {
+	lspconfig[lsp].setup({
 		on_attach = nvlsp.on_attach,
 		on_init = nvlsp.on_init,
 		capabilities = nvlsp.capabilities,
 	})
 end
 
-lspconfig("gopls", {
+lspconfig.gopls.setup({
 	on_attach = nvlsp.on_attach,
 	capabilities = nvlsp.capabilities,
 	cmd = { "gopls" },
@@ -31,7 +30,7 @@ lspconfig("gopls", {
 	},
 })
 
-lspconfig("ts_ls", {
+lspconfig.ts_ls.setup({
 	on_attach = nvlsp.on_attach,
 	capabilities = nvlsp.capabilities,
 	init_options = {
@@ -41,26 +40,26 @@ lspconfig("ts_ls", {
 	},
 })
 
-lspconfig("tailwindcss", {
+lspconfig.tailwindcss.setup({
 	on_attach = nvlsp.on_attach,
 	capabilities = nvlsp.capabilities,
 })
 
-lspconfig("pyright", {
+lspconfig.pyright.setup({
 	on_attach = nvlsp.on_attach,
 	capabilities = nvlsp.capabilities,
 	filetypes = { "python" },
 })
 
-lspconfig("eslint", {
+lspconfig.eslint.setup({
 	on_attach = nvlsp.on_attach,
 	capabilities = nvlsp.capabilities,
 })
 
-lspconfig("golangcilsp", {
+lspconfig.golangcilsp = {
 	default_config = {
 		cmd = { "golangci-lint-langserver" },
-		root_dir = lsputil.root_pattern(".git", "go.mod"),
+		root_dir = lspconfig.util.root_pattern(".git", "go.mod"),
 		init_options = {
 			command = {
 				"golangci-lint",
@@ -72,13 +71,13 @@ lspconfig("golangcilsp", {
 			},
 		},
 	},
-})
+}
 
-lspconfig("golangci_lint_ls", {
+lspconfig.golangci_lint_ls.setup({
 	filetypes = { "go", "gomod" },
 })
 
-lspconfig("clangd", {
+lspconfig.clangd.setup({
 	filetypes = { "c" },
 })