From 8c2ab48ed51b4115c475476d2731014e647bfcb7 Mon Sep 17 00:00:00 2001 From: David Senoner Date: Sat, 1 Feb 2025 22:01:10 +0100 Subject: [PATCH 1/8] lapconfig: 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 3ef6aa1974a77ef6c8fe9654f4141e796b5b306e Mon Sep 17 00:00:00 2001 From: David Senoner Date: Wed, 12 Feb 2025 16:33:32 +0100 Subject: [PATCH 2/8] 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 e7adf3910e42fbdbd3c65e759520210f266ae12d Mon Sep 17 00:00:00 2001 From: David Senoner Date: Wed, 12 Feb 2025 16:36:08 +0100 Subject: [PATCH 3/8] 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 57b069c17b45e862ef0f25904be0b435a6ce6039 Mon Sep 17 00:00:00 2001 From: David Senoner Date: Fri, 18 Apr 2025 15:38:27 +0200 Subject: [PATCH 4/8] 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 123281b16cc74ee7cf09d0b1d703d28a4da00f4a Mon Sep 17 00:00:00 2001 From: David Senoner Date: Fri, 18 Apr 2025 15:39:04 +0200 Subject: [PATCH 5/8] 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 a124b153663d970342eeb2b6fdeec978976969b6 Mon Sep 17 00:00:00 2001 From: David Senoner Date: Fri, 18 Apr 2025 15:39:43 +0200 Subject: [PATCH 6/8] 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 8c6bb614bf460a1c4bd1e9bac2e69ce87721018f Mon Sep 17 00:00:00 2001 From: David Senoner Date: Sun, 20 Apr 2025 11:03:50 +0200 Subject: [PATCH 7/8] 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 4b56685efcacaed163952c50def25820697fd7c2 Mon Sep 17 00:00:00 2001 From: David Senoner Date: Sat, 10 May 2025 10:58:14 +0200 Subject: [PATCH 8/8] 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",