From 0990d27147d89575bc566a1a6603814fcd826173 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torjus=20H=C3=A5kestad?= <torjus@usit.uio.no>
Date: Thu, 13 Nov 2025 21:45:21 +0100
Subject: [PATCH] vim: remove deprecated lspconfig stuff

---
 home/editor/neovim/plugins.lua | 33 ++++++++++++++-------------------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/home/editor/neovim/plugins.lua b/home/editor/neovim/plugins.lua
index 7b09429..91eeba0 100644
--- a/home/editor/neovim/plugins.lua
+++ b/home/editor/neovim/plugins.lua
@@ -21,8 +21,7 @@ lsp_zero.format_on_save({
 	},
 })
 -- LSP: go
-local lspconfig = require('lspconfig')
-lspconfig.gopls.setup({
+vim.lsp.config("gopls", {
 	settings = {
 		gopls = {
 			analyses = {
@@ -33,6 +32,7 @@ lspconfig.gopls.setup({
 		}
 	}
 })
+vim.lsp.enable({ "gopls" })
 
 -- GO: Automatically organize imports on save
 vim.api.nvim_create_autocmd("BufWritePre", {
@@ -59,7 +59,7 @@ vim.api.nvim_create_autocmd("BufWritePre", {
 })
 
 -- LSP: nix
-lspconfig.nil_ls.setup({
+vim.lsp.config("nil_ls", {
 	autostart = true,
 	settings = {
 		['nil'] = {
@@ -69,9 +69,10 @@ lspconfig.nil_ls.setup({
 		},
 	},
 })
+vim.lsp.enable({ "nil_ls" })
 
 -- LSP: lua
-lspconfig.lua_ls.setup({
+vim.lsp.config("lua_ls", {
 	on_init = function(client)
 		local path = client.workspace_folders[1].name
 		if vim.loop.fs_stat(path .. '/.luarc.json') or vim.loop.fs_stat(path .. '/.luarc.jsonc') then
@@ -110,9 +111,11 @@ lspconfig.lua_ls.setup({
 		}
 	}
 })
+vim.lsp.enable({ "lua_ls" })
+
 
 -- LSP: ts/js
-lspconfig.ts_ls.setup({
+vim.lsp.config("ts_ls", {
 	init_options = {
 		plugins = {
 		},
@@ -123,16 +126,13 @@ lspconfig.ts_ls.setup({
 		"typescriptreact",
 	},
 })
-
--- LSP: rust
-
-lspconfig.rust_analyzer.setup {
-}
+vim.lsp.enable({ "ts_ls" })
 
 -- LSP: python
 -- Ruff server
-lspconfig.ruff.setup({
+vim.lsp.config("ruff", {
 })
+vim.lsp.enable({ "ruff" })
 
 -- Ruff: automatically format on save
 vim.api.nvim_create_autocmd("BufWritePre", {
@@ -159,7 +159,7 @@ vim.api.nvim_create_autocmd("LspAttach", {
 })
 
 -- Pyright
-lspconfig.pyright.setup {
+vim.lsp.config("pyright", {
 	settings = {
 		pyright = {
 			-- Using Ruff's import organizer
@@ -172,13 +172,8 @@ lspconfig.pyright.setup {
 			},
 		},
 	},
-}
-
--- LSP: C/C++
-lspconfig.clangd.setup({})
-
--- LSP: zig
-lspconfig.zls.setup({})
+})
+vim.lsp.enable({ "pyright" })
 
 -- Telescope
 require('telescope').setup({