From 8eb417638a5a33d53ca92ff6782e98c36fe70114 Mon Sep 17 00:00:00 2001 From: David Senoner Date: Sat, 1 Feb 2025 22:01:10 +0100 Subject: [PATCH 01/10] lspconfig: fix half-baked rename --- lua/plugins/lspconfig.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/plugins/lspconfig.lua b/lua/plugins/lspconfig.lua index bc51a6c..1005f08 100644 --- a/lua/plugins/lspconfig.lua +++ b/lua/plugins/lspconfig.lua @@ -21,7 +21,7 @@ return { plugins = { { name = "@vue/typescript-plugin", - location = vue_language_server_path, + location = volar_path, languages = { "vue" }, }, }, From 6252e08783b4b5e236bb9c441156eba4b89d65db Mon Sep 17 00:00:00 2001 From: David Senoner Date: Wed, 12 Feb 2025 16:33:32 +0100 Subject: [PATCH 02/10] misc: remove whitespace damage --- lua/plugins/lsp.lua | 2 +- lua/plugins/telescope.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 037c0ad..1562e1e 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -8,7 +8,7 @@ return { }, { "williamboman/mason-lspconfig.nvim", - + config = function() local mason_lspconfig = require("mason") diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua index 7d558f5..b65ec17 100644 --- a/lua/plugins/telescope.lua +++ b/lua/plugins/telescope.lua @@ -9,7 +9,7 @@ return { require("telescope").setup({}) local builtin = require("telescope.builtin") - + vim.keymap.set("n", "", builtin.find_files, {}) vim.keymap.set("n", "", builtin.live_grep, {}) end From 472a1b8cea2dc1190b7bb24762913f6105960435 Mon Sep 17 00:00:00 2001 From: David Senoner Date: Wed, 12 Feb 2025 16:36:08 +0100 Subject: [PATCH 03/10] lspconfig: fix regression from afdc916 --- lua/plugins/lsp.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 1562e1e..7716dbc 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -10,7 +10,7 @@ return { "williamboman/mason-lspconfig.nvim", config = function() - local mason_lspconfig = require("mason") + local mason_lspconfig = require("mason-lspconfig") mason_lspconfig.setup({ ensure_installed = { "clangd", "texlab", "lua_ls", "matlab_ls", "mesonlsp", "sqlls", "svlangserver", "ts_ls", "volar" } From f3e795d388761939fa84feba701a50de33a6a960 Mon Sep 17 00:00:00 2001 From: David Senoner Date: Fri, 18 Apr 2025 15:38:27 +0200 Subject: [PATCH 04/10] lsp: remove unused servers --- lua/plugins/lsp.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 7716dbc..dc45f9d 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -13,8 +13,9 @@ return { local mason_lspconfig = require("mason-lspconfig") mason_lspconfig.setup({ - ensure_installed = { "clangd", "texlab", "lua_ls", "matlab_ls", "mesonlsp", "sqlls", "svlangserver", "ts_ls", "volar" } + ensure_installed = { "clangd", "lua_ls", "matlab_ls", "mesonlsp", "texlab", "ts_ls", "volar", "zig" } }) + end } } From ce788d1acd4ad1e3b3a69689a3400665a4c79645 Mon Sep 17 00:00:00 2001 From: David Senoner Date: Fri, 18 Apr 2025 15:39:04 +0200 Subject: [PATCH 05/10] lspconfig: setup zig --- lua/plugins/lsp.lua | 2 +- lua/plugins/lspconfig.lua | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index dc45f9d..010dd9d 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -13,7 +13,7 @@ return { local mason_lspconfig = require("mason-lspconfig") mason_lspconfig.setup({ - ensure_installed = { "clangd", "lua_ls", "matlab_ls", "mesonlsp", "texlab", "ts_ls", "volar", "zig" } + ensure_installed = { "clangd", "lua_ls", "matlab_ls", "mesonlsp", "texlab", "ts_ls", "volar", "zls" } }) end diff --git a/lua/plugins/lspconfig.lua b/lua/plugins/lspconfig.lua index 1005f08..a94c28c 100644 --- a/lua/plugins/lspconfig.lua +++ b/lua/plugins/lspconfig.lua @@ -29,5 +29,6 @@ return { filetypes = { "typescript", "javascript", "javascriptreact", "typescriptreact", "vue" }, }) lspconfig.volar.setup({}) + lspconfig.zig.setup({}) end } From ca1a92e3762ec875ce4f0ef65aa82da48fdb7974 Mon Sep 17 00:00:00 2001 From: David Senoner Date: Fri, 18 Apr 2025 15:39:43 +0200 Subject: [PATCH 06/10] fixed 0.11 deprecations --- lua/plugins/colorscheme.lua | 2 +- lua/vim-options.lua | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua index 0af4ee2..edf62c5 100644 --- a/lua/plugins/colorscheme.lua +++ b/lua/plugins/colorscheme.lua @@ -10,6 +10,6 @@ return { theme = "dragon" }) - vim.cmd("colorscheme kanagawa") + vim.cmd("colorscheme kanagawa-dragon") end } diff --git a/lua/vim-options.lua b/lua/vim-options.lua index 7d83804..ebc0717 100644 --- a/lua/vim-options.lua +++ b/lua/vim-options.lua @@ -1,4 +1,3 @@ -vim.o.background = "" vim.cmd("set number") vim.cmd("set expandtab") vim.cmd("set tabstop=2") From d32ca1276da59341a00045d06716844a62782208 Mon Sep 17 00:00:00 2001 From: David Senoner Date: Sun, 20 Apr 2025 11:03:50 +0200 Subject: [PATCH 07/10] zig: add plugin to overwrite removals in nvim 0.11 --- lua/plugins/zig.lua | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 lua/plugins/zig.lua diff --git a/lua/plugins/zig.lua b/lua/plugins/zig.lua new file mode 100644 index 0000000..8e911ee --- /dev/null +++ b/lua/plugins/zig.lua @@ -0,0 +1,3 @@ +return { + "ziglang/zig.vim" +} From 26c7c6038d7ed5b2aa63b17b7db5de0dc89d7c03 Mon Sep 17 00:00:00 2001 From: David Senoner Date: Sat, 10 May 2025 10:58:14 +0200 Subject: [PATCH 08/10] Lazy: update setup code to match online Lazy docs --- init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.lua b/init.lua index 9e65493..bf72b5a 100644 --- a/init.lua +++ b/init.lua @@ -1,7 +1,7 @@ require("vim-options") local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" -if not vim.loop.fs_stat(lazypath) then +if not (vim.uv or vim.loop).fs_stat(lazypath) then vim.fn.system({ "git", "clone", From e8db509c870259baa45422a0041f85f38f64f1ca Mon Sep 17 00:00:00 2001 From: David Senoner Date: Sat, 10 May 2025 11:03:51 +0200 Subject: [PATCH 09/10] lspconfig: update for Mason 2.0 --- lua/plugins/lsp.lua | 2 +- lua/plugins/lspconfig.lua | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 010dd9d..7cd4fb9 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -1,6 +1,6 @@ return { { - "williamboman/mason.nvim", + "mason-org/mason.nvim", config = function() require("mason").setup() diff --git a/lua/plugins/lspconfig.lua b/lua/plugins/lspconfig.lua index a94c28c..d638ab4 100644 --- a/lua/plugins/lspconfig.lua +++ b/lua/plugins/lspconfig.lua @@ -3,8 +3,6 @@ return { config = function() local lspconfig = require("lspconfig") - local mason_registry = require("mason-registry") - local volar_path = mason_registry.get_package("vue-language-server"):get_install_path() .. "/node_modules/@vue/language-server" lspconfig.clangd.setup({ cmd = { "clangd", "-header-insertion=never" }, @@ -21,7 +19,7 @@ return { plugins = { { name = "@vue/typescript-plugin", - location = volar_path, + location = vim.fn.expand("$MASON") .. "/packages/vue-language-server/node_modules/@vue/language-server", languages = { "vue" }, }, }, From 45444ef94721d468b32b9c679f031d25a066d834 Mon Sep 17 00:00:00 2001 From: David Senoner Date: Sat, 10 May 2025 11:09:02 +0200 Subject: [PATCH 10/10] lspconfig: adapted to use `automatic_enable` for all lsp servers --- lua/plugins/lsp.lua | 3 ++- lua/plugins/lspconfig.lua | 12 ++---------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 7cd4fb9..6268656 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -13,7 +13,8 @@ return { local mason_lspconfig = require("mason-lspconfig") mason_lspconfig.setup({ - ensure_installed = { "clangd", "lua_ls", "matlab_ls", "mesonlsp", "texlab", "ts_ls", "volar", "zls" } + ensure_installed = { "clangd", "lua_ls", "matlab_ls", "mesonlsp", "texlab", "ts_ls", "volar", "zls" }, + automatic_enable = true }) end diff --git a/lua/plugins/lspconfig.lua b/lua/plugins/lspconfig.lua index d638ab4..2879b39 100644 --- a/lua/plugins/lspconfig.lua +++ b/lua/plugins/lspconfig.lua @@ -4,17 +4,11 @@ return { config = function() local lspconfig = require("lspconfig") - lspconfig.clangd.setup({ + vim.lsp.config("clangd", { cmd = { "clangd", "-header-insertion=never" }, }) - lspconfig.lua_ls.setup({}) - lspconfig.matlab_ls.setup({}) - lspconfig.mesonlsp.setup({}) - lspconfig.sqlls.setup({}) - lspconfig.svlangserver.setup({}) - lspconfig.texlab.setup({}) - lspconfig.ts_ls.setup({ + vim.lsp.config("ts_ls", { init_options = { plugins = { { @@ -26,7 +20,5 @@ return { }, filetypes = { "typescript", "javascript", "javascriptreact", "typescriptreact", "vue" }, }) - lspconfig.volar.setup({}) - lspconfig.zig.setup({}) end }