Compare commits

...

10 commits

Author SHA1 Message Date
45444ef947 lspconfig: adapted to use automatic_enable for all lsp servers
Some checks are pending
Send submodule updates to parent repo / update (main) (push) Waiting to run
Send submodule updates to parent repo / update (tiling) (push) Waiting to run
2025-05-10 11:11:08 +02:00
e8db509c87 lspconfig: update for Mason 2.0 2025-05-10 11:11:08 +02:00
26c7c6038d Lazy: update setup code to match online Lazy docs 2025-05-10 11:11:08 +02:00
d32ca1276d zig: add plugin to overwrite removals in nvim 0.11 2025-05-10 11:11:08 +02:00
ca1a92e376 fixed 0.11 deprecations 2025-05-10 11:11:08 +02:00
ce788d1acd lspconfig: setup zig 2025-05-10 11:11:08 +02:00
f3e795d388 lsp: remove unused servers 2025-05-10 11:11:08 +02:00
472a1b8cea lspconfig: fix regression from afdc916 2025-05-10 11:11:08 +02:00
6252e08783 misc: remove whitespace damage 2025-05-10 11:11:08 +02:00
8eb417638a lspconfig: fix half-baked rename 2025-05-10 11:10:59 +02:00
7 changed files with 15 additions and 20 deletions

View file

@ -1,7 +1,7 @@
require("vim-options") require("vim-options")
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" 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({ vim.fn.system({
"git", "git",
"clone", "clone",

View file

@ -10,6 +10,6 @@ return {
theme = "dragon" theme = "dragon"
}) })
vim.cmd("colorscheme kanagawa") vim.cmd("colorscheme kanagawa-dragon")
end end
} }

View file

@ -1,6 +1,6 @@
return { return {
{ {
"williamboman/mason.nvim", "mason-org/mason.nvim",
config = function() config = function()
require("mason").setup() require("mason").setup()
@ -8,13 +8,15 @@ return {
}, },
{ {
"williamboman/mason-lspconfig.nvim", "williamboman/mason-lspconfig.nvim",
config = function() config = function()
local mason_lspconfig = require("mason") local mason_lspconfig = require("mason-lspconfig")
mason_lspconfig.setup({ 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", "zls" },
automatic_enable = true
}) })
end end
} }
} }

View file

@ -3,31 +3,22 @@ return {
config = function() config = function()
local lspconfig = require("lspconfig") 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({ vim.lsp.config("clangd", {
cmd = { "clangd", "-header-insertion=never" }, 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 = { init_options = {
plugins = { plugins = {
{ {
name = "@vue/typescript-plugin", name = "@vue/typescript-plugin",
location = vue_language_server_path, location = vim.fn.expand("$MASON") .. "/packages/vue-language-server/node_modules/@vue/language-server",
languages = { "vue" }, languages = { "vue" },
}, },
}, },
}, },
filetypes = { "typescript", "javascript", "javascriptreact", "typescriptreact", "vue" }, filetypes = { "typescript", "javascript", "javascriptreact", "typescriptreact", "vue" },
}) })
lspconfig.volar.setup({})
end end
} }

View file

@ -9,7 +9,7 @@ return {
require("telescope").setup({}) require("telescope").setup({})
local builtin = require("telescope.builtin") local builtin = require("telescope.builtin")
vim.keymap.set("n", "<C-p>", builtin.find_files, {}) vim.keymap.set("n", "<C-p>", builtin.find_files, {})
vim.keymap.set("n", "<C-f>", builtin.live_grep, {}) vim.keymap.set("n", "<C-f>", builtin.live_grep, {})
end end

3
lua/plugins/zig.lua Normal file
View file

@ -0,0 +1,3 @@
return {
"ziglang/zig.vim"
}

View file

@ -1,4 +1,3 @@
vim.o.background = ""
vim.cmd("set number") vim.cmd("set number")
vim.cmd("set expandtab") vim.cmd("set expandtab")
vim.cmd("set tabstop=2") vim.cmd("set tabstop=2")