From ff1c91dad852a5daae7343f180cbf154b56a055a Mon Sep 17 00:00:00 2001
From: Ryan Cavicchioni <ryan@cavi.cc>
Date: Sat, 4 Oct 2025 11:25:38 -0500
Subject: [PATCH] migrate to updated lspconfig syntax

---
 .config/nvim/lua/plugins/lspconfig.lua | 47 ++++++++++++++------------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/.config/nvim/lua/plugins/lspconfig.lua b/.config/nvim/lua/plugins/lspconfig.lua
index 7888f6b..5e0215f 100644
--- a/.config/nvim/lua/plugins/lspconfig.lua
+++ b/.config/nvim/lua/plugins/lspconfig.lua
@@ -1,13 +1,13 @@
 return {
 	{
-		"williamboman/mason.nvim",
+		"mason-org/mason.nvim",
 		config = function()
 			require("mason").setup()
 		end,
 	},
 	{
-		"williamboman/mason-lspconfig.nvim",
-		dependencies = { "williamboman/mason.nvim" },
+		"mason-org/mason-lspconfig.nvim",
+		dependencies = { "mason-org/mason.nvim" },
 		config = function()
 			require("mason-lspconfig").setup({
 				ensure_installed = {
@@ -18,7 +18,8 @@ return {
 					"yamlls",
 					"pyright",
 					"zls",
-					"gopls",
+                    "gopls",
+					"golangci_lint_ls",
 					"bashls",
 				},
 			})
@@ -26,22 +27,9 @@ return {
 	},
 	{
 		"neovim/nvim-lspconfig",
-		dependencies = { "williamboman/mason-lspconfig.nvim" },
+		dependencies = { "mason-org/mason-lspconfig.nvim" },
 		config = function()
-			local lspconfig = require("lspconfig")
-
-			lspconfig.zls.setup({})
-			lspconfig.ruby_lsp.setup({
-				init_options = {
-					formatter = "standard",
-					linters = { "standard" },
-				},
-			})
-			-- lspconfig.standardrb.setup({})
-			lspconfig.bashls.setup({})
-			lspconfig.yamlls.setup({})
-			lspconfig.terraformls.setup({})
-			lspconfig.lua_ls.setup({
+			vim.lsp.config("lua_ls", {
 				settings = {
 					Lua = {
 						diagnostics = {
@@ -57,9 +45,24 @@ return {
 					},
 				},
 			})
-			lspconfig.pyright.setup({})
-			lspconfig.gopls.setup({})
-			lspconfig.zls.setup({})
+
+			vim.lsp.config("ruby_lsp", {
+				init_options = {
+					formatter = "standard",
+					linters = { "standard" },
+				},
+			})
+
+			vim.lsp.enable("bashls")
+			vim.lsp.enable("golangci_lint_ls")
+			vim.lsp.enable("lua_ls")
+			vim.lsp.enable("pyright")
+			vim.lsp.enable("ruby_lsp")
+			vim.lsp.enable("terraformls")
+			vim.lsp.enable("yamlls")
+			vim.lsp.enable("zls")
+
+			-- vim.lsp.enable("standardrb")
 		end,
 	},
 }