lsp refactor

lua/plugins/lsp-config.lua

@@ -7,61 +7,43 @@ return {
 	},
 	{
 		"williamboman/mason-lspconfig.nvim",
-		config = function()
-			require("mason-lspconfig").setup({
-				ensure_installed = { "lua_ls", "ts_ls", "svelte", "tailwindcss", "cssls", "tinymist", },
-				automatic_enable = true,
-			})
-		end,
+		opts = {
+			ensure_installed = {
+				"lua_ls",
+				"ts_ls",
+				"svelte",
+				"tailwindcss",
+				"cssls",
+				"tinymist",
+			},
+		},
 	},
 	{
 		"neovim/nvim-lspconfig",
+		dependencies = {
+			"williamboman/mason-lspconfig.nvim",
+		},
 		config = function()
-			local original_capabilities = vim.lsp.protocol.make_client_capabilities()
-			local capabilities = require("blink.cmp").get_lsp_capabilities(original_capabilities)
+			local capabilities = require("blink.cmp").get_lsp_capabilities(vim.lsp.protocol.make_client_capabilities())
 			local lspconfig = require("lspconfig")
 
-			lspconfig.lua_ls.setup({
-				capabilities = capabilities,
-			})
-			lspconfig.ts_ls.setup({
-				capabilities = capabilities,
-			})
-			lspconfig.svelte.setup({
-				capabilities = capabilities,
-			})
-			lspconfig.tailwindcss.setup({
-				capabilities = capabilities,
-			})
-			lspconfig.cssls.setup({
-				capabilities = capabilities,
-				settings = {
-					css = {
-						lint = {
-							unknownAtRules = "ignore",
-						},
-					},
-					scss = {
-						lint = {
-							unknownAtRules = "ignore",
-						},
-					},
-					less = {
-						lint = {
-							unknownAtRules = "ignore",
-						},
-					},
-				},
-			})
-			lspconfig.sourcekit.setup({
-				capabilities = capabilities,
-			})
-			lspconfig.tinymist.setup({
-				capabilities = capabilities,
-			})
-			vim.keymap.set("n", "gd", vim.lsp.buf.definition, {})
-			vim.keymap.set("n", "K", vim.lsp.buf.hover, {})
-			vim.keymap.set({ "n", "v" }, "<leader>ca", vim.lsp.buf.code_action, {})
+			local mason_lspconfig = require("mason-lspconfig")
+			local mason_servers = mason_lspconfig.get_installed_servers()
+
+			local manual_servers = {
+				"sourcekit",
+			}
+
+			for _, server in ipairs(vim.tbl_extend("force", mason_servers, manual_servers)) do
+				lspconfig[server].setup({
+					capabilities = capabilities,
+				})
+			end
+
+			local map = vim.keymap.set
+			map("n", "gd", vim.lsp.buf.definition, {})
+			map("n", "K", vim.lsp.buf.hover, {})
+			map({ "n", "v" }, "<leader>ca", vim.lsp.buf.code_action, {})
 
 			vim.diagnostic.config({
 				virtual_text = true,

lua/vim-options.lua

@@ -15,32 +15,32 @@ vim.keymap.set("n", "k", "gk", { noremap = true, silent = true })
 vim.keymap.set("v", "j", "gj", { noremap = true, silent = true })
 vim.keymap.set("v", "k", "gk", { noremap = true, silent = true })
 
--- Spellchecker
-vim.api.nvim_create_autocmd("FileType", {
-	callback = function()
-		local buftype = vim.api.nvim_buf_get_option(0, "buftype")
-		local filetype = vim.api.nvim_buf_get_option(0, "filetype")
-
-		local skip_buftypes = { "nofile", "prompt", "terminal" }
-		local skip_filetypes = { "cmp_menu", "cmp_doc", "TelescopePrompt", "NvimTree" }
-
-		-- If current buffer is in skip list, do nothing
-		for _, bt in ipairs(skip_buftypes) do
-			if buftype == bt then
-				return
-			end
-		end
-		for _, ft in ipairs(skip_filetypes) do
-			if filetype == ft then
-				return
-			end
-		end
-
-		-- Else, enable spellcheck
-		vim.opt_local.spell = true
-		vim.opt_local.spelllang = "en"
-	end,
-})
+-- -- Spellchecker
+-- vim.api.nvim_create_autocmd("FileType", {
+-- 	callback = function()
+-- 		local buftype = vim.api.nvim_buf_get_option(0, "buftype")
+-- 		local filetype = vim.api.nvim_buf_get_option(0, "filetype")
+--
+-- 		local skip_buftypes = { "nofile", "prompt", "terminal" }
+-- 		local skip_filetypes = { "cmp_menu", "cmp_doc", "TelescopePrompt", "NvimTree" }
+--
+-- 		-- If current buffer is in skip list, do nothing
+-- 		for _, bt in ipairs(skip_buftypes) do
+-- 			if buftype == bt then
+-- 				return
+-- 			end
+-- 		end
+-- 		for _, ft in ipairs(skip_filetypes) do
+-- 			if filetype == ft then
+-- 				return
+-- 			end
+-- 		end
+--
+-- 		-- Else, enable spellcheck
+-- 		vim.opt_local.spell = true
+-- 		vim.opt_local.spelllang = "en"
+-- 	end,
+-- })
 
 -- Toggle spell check with <leader>sc
 vim.keymap.set("n", "<leader>sc", function()