From 6a31cf81a750a5ee32f36da1735b5a250bda2c73 Mon Sep 17 00:00:00 2001 From: Janis Hutz Date: Sat, 3 Oct 2026 09:01:30 +0200 Subject: [PATCH] refactor(lsp): clean up config --- nvim/lua/plugins/lsp/ls/bashls.lua | 14 ++--- nvim/lua/plugins/lsp/ls/c.lua | 7 +-- nvim/lua/plugins/lsp/ls/dart.lua | 17 ------ nvim/lua/plugins/lsp/ls/docker.lua | 14 ++--- nvim/lua/plugins/lsp/ls/gh-actions.lua | 14 ++--- nvim/lua/plugins/lsp/ls/go.lua | 14 ++--- nvim/lua/plugins/lsp/ls/haskell.lua | 14 ++--- nvim/lua/plugins/lsp/ls/hypr.lua | 14 ++--- nvim/lua/plugins/lsp/ls/low-level.lua | 17 +++--- nvim/lua/plugins/lsp/ls/luals.lua | 14 ++--- nvim/lua/plugins/lsp/ls/ocaml.lua | 14 ++--- nvim/lua/plugins/lsp/ls/pyright.lua | 14 ++--- nvim/lua/plugins/lsp/ls/qml.lua | 14 ++--- nvim/lua/plugins/lsp/ls/ruby.lua | 14 ++--- nvim/lua/plugins/lsp/ls/rust-analyzer.lua | 14 ++--- nvim/lua/plugins/lsp/ls/sql.lua | 14 ++--- nvim/lua/plugins/lsp/ls/text.lua | 22 ++++---- nvim/lua/plugins/lsp/ls/web.lua | 63 +++++++++++------------ nvim/lua/plugins/lsp/ls/yaml.lua | 14 ++--- nvim/lua/plugins/lsp/lspconfig.lua | 1 - 20 files changed, 117 insertions(+), 206 deletions(-) delete mode 100644 nvim/lua/plugins/lsp/ls/dart.lua diff --git a/nvim/lua/plugins/lsp/ls/bashls.lua b/nvim/lua/plugins/lsp/ls/bashls.lua index c60e798..b5e6e73 100644 --- a/nvim/lua/plugins/lsp/ls/bashls.lua +++ b/nvim/lua/plugins/lsp/ls/bashls.lua @@ -1,17 +1,13 @@ -- ┌ ┐ -- │ Bash │ -- └ ┘ -local lsp = vim.lsp +local opts = require("lsp-options") -local capabilities = require("lsp-options").capabilities -local on_attach = require("lsp-options").on_attach - -lsp.config("bashls", { - capabilities = capabilities, - on_attach = on_attach, +vim.lsp.config("bashls", { + capabilities = opts.capabilities, + on_attach = opts.on_attach, }) -- ── Enable configs ─────────────────────────────────────────────── -local enable = vim.lsp.enable -enable("bashls") +vim.lsp.enable("bashls") diff --git a/nvim/lua/plugins/lsp/ls/c.lua b/nvim/lua/plugins/lsp/ls/c.lua index 4917d07..228016f 100644 --- a/nvim/lua/plugins/lsp/ls/c.lua +++ b/nvim/lua/plugins/lsp/ls/c.lua @@ -1,11 +1,9 @@ -- ┌ ┐ -- │ C, Cpp, objc │ -- └ ┘ -local lsp = vim.lsp - local opts = require("lsp-options") -lsp.config("clangd", { +vim.lsp.config("clangd", { cmd = { "clangd", "--suggest-missing-includes", @@ -17,5 +15,4 @@ lsp.config("clangd", { }) -- ── Enable configs ─────────────────────────────────────────────── -local enable = vim.lsp.enable -enable("clangd") +vim.lsp.enable("clangd") diff --git a/nvim/lua/plugins/lsp/ls/dart.lua b/nvim/lua/plugins/lsp/ls/dart.lua deleted file mode 100644 index d6a15a7..0000000 --- a/nvim/lua/plugins/lsp/ls/dart.lua +++ /dev/null @@ -1,17 +0,0 @@ --- ┌ ┐ --- │ Dart and Flutter │ --- └ ┘ -local lsp = vim.lsp - -local capabilities = require("lsp-options").capabilities -local on_attach = require("lsp-options").on_attach - -lsp.config("dartls", { - capabilities = capabilities, - on_attach = on_attach, -}) - - --- ── Enable configs ─────────────────────────────────────────────── -local enable = vim.lsp.enable -enable("dartls") diff --git a/nvim/lua/plugins/lsp/ls/docker.lua b/nvim/lua/plugins/lsp/ls/docker.lua index 98f814c..8b11a29 100644 --- a/nvim/lua/plugins/lsp/ls/docker.lua +++ b/nvim/lua/plugins/lsp/ls/docker.lua @@ -1,20 +1,16 @@ -- ┌ ┐ -- │ Docker │ -- └ ┘ -local lsp = vim.lsp +local opts = require("lsp-options") -local capabilities = require("lsp-options").capabilities -local on_attach = require("lsp-options").on_attach - -lsp.config("docker_language_server", { - capabilities = capabilities, - on_attach = on_attach, +vim.lsp.config("docker_language_server", { + capabilities = opts.capabilities, + on_attach = opts.on_attach, }) -- ── Enable configs ─────────────────────────────────────────────── -local enable = vim.lsp.enable -enable("docker_language_server") +vim.lsp.enable("docker_language_server") vim.filetype.add({ filename = { ["docker-compose.yml"] = { "yaml.docker-compose", { priority = 100 } }, diff --git a/nvim/lua/plugins/lsp/ls/gh-actions.lua b/nvim/lua/plugins/lsp/ls/gh-actions.lua index e785fd7..0b4821f 100644 --- a/nvim/lua/plugins/lsp/ls/gh-actions.lua +++ b/nvim/lua/plugins/lsp/ls/gh-actions.lua @@ -1,14 +1,11 @@ -- ┌ ┐ -- │ GitHub Actions │ -- └ ┘ -local lsp = vim.lsp +local opts = require("lsp-options") -local capabilities = require("lsp-options").capabilities -local on_attach = require("lsp-options").on_attach - -lsp.config("gh_actions_ls", { - capabilities = capabilities, - on_attach = on_attach, +vim.lsp.config("gh_actions_ls", { + capabilities = opts.capabilities, + on_attach = opts.on_attach, filetypes = { "yaml.actions", }, @@ -16,5 +13,4 @@ lsp.config("gh_actions_ls", { -- ── Enable configs ─────────────────────────────────────────────── -local enable = vim.lsp.enable -enable("gh_actions_ls") +vim.lsp.enable("gh_actions_ls") diff --git a/nvim/lua/plugins/lsp/ls/go.lua b/nvim/lua/plugins/lsp/ls/go.lua index 0305580..dd15fed 100644 --- a/nvim/lua/plugins/lsp/ls/go.lua +++ b/nvim/lua/plugins/lsp/ls/go.lua @@ -1,17 +1,13 @@ -- ┌ ┐ -- │ GO │ -- └ ┘ -local lsp = vim.lsp +local opts = require("lsp-options") -local capabilities = require("lsp-options").capabilities -local on_attach = require("lsp-options").on_attach - -lsp.config("gopls", { - capabilities = capabilities, - on_attach = on_attach, +vim.lsp.config("gopls", { + capabilities = opts.capabilities, + on_attach = opts.on_attach, }) -- ── Enable configs ─────────────────────────────────────────────── -local enable = vim.lsp.enable -enable("gopls") +vim.lsp.enable("gopls") diff --git a/nvim/lua/plugins/lsp/ls/haskell.lua b/nvim/lua/plugins/lsp/ls/haskell.lua index 8e3e924..2806454 100644 --- a/nvim/lua/plugins/lsp/ls/haskell.lua +++ b/nvim/lua/plugins/lsp/ls/haskell.lua @@ -1,17 +1,13 @@ -- ┌ ┐ -- │ Haskell │ -- └ ┘ -local lsp = vim.lsp +local opts = require("lsp-options") -local capabilities = require("lsp-options").capabilities -local on_attach = require("lsp-options").on_attach - -lsp.config("hls", { - capabilities = capabilities, - on_attach = on_attach, +vim.lsp.config("hls", { + capabilities = opts.capabilities, + on_attach = opts.on_attach, }) -- ── Enable configs ─────────────────────────────────────────────── -local enable = vim.lsp.enable -enable("hls") +vim.lsp.enable("hls") diff --git a/nvim/lua/plugins/lsp/ls/hypr.lua b/nvim/lua/plugins/lsp/ls/hypr.lua index 3f422b9..08c0b86 100644 --- a/nvim/lua/plugins/lsp/ls/hypr.lua +++ b/nvim/lua/plugins/lsp/ls/hypr.lua @@ -1,17 +1,13 @@ -- ┌ ┐ -- │ Hyprland │ -- └ ┘ -local lsp = vim.lsp +local opts = require("lsp-options") -local capabilities = require("lsp-options").capabilities -local on_attach = require("lsp-options").on_attach - -lsp.config("hyprls", { - capabilities = capabilities, - on_attach = on_attach, +vim.lsp.config("hyprls", { + capabilities = opts.capabilities, + on_attach = opts.on_attach, }) -- ── Enable configs ─────────────────────────────────────────────── -local enable = vim.lsp.enable -enable("hyprls") +vim.lsp.enable("hyprls") diff --git a/nvim/lua/plugins/lsp/ls/low-level.lua b/nvim/lua/plugins/lsp/ls/low-level.lua index bbfd5d1..3b4a07d 100644 --- a/nvim/lua/plugins/lsp/ls/low-level.lua +++ b/nvim/lua/plugins/lsp/ls/low-level.lua @@ -2,16 +2,14 @@ -- │ Low-level (HDL and ASM) │ -- └ ┘ local lsp = vim.lsp - -local capabilities = require("lsp-options").capabilities -local on_attach = require("lsp-options").on_attach +local opts = require("lsp-options") -- ┌ ┐ -- │ ASM │ -- └ ┘ lsp.config("asm_lsp", { - on_attach = on_attach, - capabilities = capabilities, + on_attach = opts.on_attach, + capabilities = opts.capabilities, }) -- ┌ ┐ @@ -24,20 +22,19 @@ local verilog_root_dir = function() return root_pattern(filename) or lspconfutil.path.dirname(filename) end lsp.config("veridian", { - capabilities = capabilities, - on_attach = on_attach, + capabilities = opts.capabilities, + on_attach = opts.on_attach, root_dir = verilog_root_dir, }) lsp.config("verible", { -- cmd = { 'verible-verilog-ls', '--rules_config=/home/janis/.config/nvim/util/verible-conf.json' }, cmd = { "verible-verilog-ls", "--rules=-no-trailing-spaces", "" }, - capabilities = capabilities, - on_attach = on_attach, + capabilities = opts.capabilities, + on_attach = opts.on_attach, root_dir = verilog_root_dir, }) - -- ── Enable configs ─────────────────────────────────────────────── local enable = vim.lsp.enable enable("veridian") diff --git a/nvim/lua/plugins/lsp/ls/luals.lua b/nvim/lua/plugins/lsp/ls/luals.lua index 3bd89c4..c9d2c7a 100644 --- a/nvim/lua/plugins/lsp/ls/luals.lua +++ b/nvim/lua/plugins/lsp/ls/luals.lua @@ -1,14 +1,11 @@ -- ┌ ┐ -- │ LUA │ -- └ ┘ -local lsp = vim.lsp +local opts = require("lsp-options") -local capabilities = require("lsp-options").capabilities -local on_attach = require("lsp-options").on_attach - -lsp.config("lua_ls", { - capabilities = capabilities, - on_attach = on_attach, +vim.lsp.config("lua_ls", { + capabilities = opts.capabilities, + on_attach = opts.on_attach, settings = { Lua = { -- make the language server recognize "vim" global @@ -34,5 +31,4 @@ lsp.config("lua_ls", { }) -- ── Enable configs ─────────────────────────────────────────────── -local enable = vim.lsp.enable -enable("lua_ls") +vim.lsp.enable("lua_ls") diff --git a/nvim/lua/plugins/lsp/ls/ocaml.lua b/nvim/lua/plugins/lsp/ls/ocaml.lua index 04f725e..0b6a5c9 100644 --- a/nvim/lua/plugins/lsp/ls/ocaml.lua +++ b/nvim/lua/plugins/lsp/ls/ocaml.lua @@ -1,14 +1,11 @@ -- ┌ ┐ -- │ OCAML │ -- └ ┘ -local lsp = vim.lsp +local opts = require("lsp-options") -local capabilities = require("lsp-options").capabilities -local on_attach = require("lsp-options").on_attach - -lsp.config("ocamllsp", { - capabilities = capabilities, - on_attach = on_attach, +vim.lsp.config("ocamllsp", { + capabilities = opts.capabilities, + on_attach = opts.on_attach, }) vim.api.nvim_create_autocmd('BufReadPost', { @@ -20,5 +17,4 @@ vim.api.nvim_create_autocmd('BufReadPost', { }) -- ── Enable configs ─────────────────────────────────────────────── -local enable = vim.lsp.enable -enable("ocamllsp") +vim.lsp.enable("ocamllsp") diff --git a/nvim/lua/plugins/lsp/ls/pyright.lua b/nvim/lua/plugins/lsp/ls/pyright.lua index 03b60a6..4e7d56d 100644 --- a/nvim/lua/plugins/lsp/ls/pyright.lua +++ b/nvim/lua/plugins/lsp/ls/pyright.lua @@ -1,17 +1,13 @@ -- ┌ ┐ -- │ Python │ -- └ ┘ -local lsp = vim.lsp +local opts = require("lsp-options") -local capabilities = require("lsp-options").capabilities -local on_attach = require("lsp-options").on_attach - -lsp.config("pyright", { - capabilities = capabilities, - on_attach = on_attach, +vim.lsp.config("pyright", { + capabilities = opts.capabilities, + on_attach = opts.on_attach, }) -- ── Enable configs ─────────────────────────────────────────────── -local enable = vim.lsp.enable -enable("pyright") +vim.lsp.enable("pyright") diff --git a/nvim/lua/plugins/lsp/ls/qml.lua b/nvim/lua/plugins/lsp/ls/qml.lua index 2c5f6d7..ee1e68b 100644 --- a/nvim/lua/plugins/lsp/ls/qml.lua +++ b/nvim/lua/plugins/lsp/ls/qml.lua @@ -1,17 +1,13 @@ -- ┌ ┐ -- │ QML │ -- └ ┘ -local lsp = vim.lsp +local opts = require("lsp-options") -local capabilities = require("lsp-options").capabilities -local on_attach = require("lsp-options").on_attach - -lsp.config("qmlls", { - capabilities = capabilities, - on_attach = on_attach, +vim.lsp.config("qmlls", { + capabilities = opts.capabilities, + on_attach = opts.on_attach, cmd = { "qmlls6" }, }) -- ── Enable configs ─────────────────────────────────────────────── -local enable = vim.lsp.enable -enable("qmlls") +vim.lsp.enable("qmlls") diff --git a/nvim/lua/plugins/lsp/ls/ruby.lua b/nvim/lua/plugins/lsp/ls/ruby.lua index 7cc2ef2..d0efae1 100644 --- a/nvim/lua/plugins/lsp/ls/ruby.lua +++ b/nvim/lua/plugins/lsp/ls/ruby.lua @@ -1,17 +1,13 @@ -- ┌ ┐ -- │ Ruby │ -- └ ┘ -local lsp = vim.lsp +local opts = require("lsp-options") -local capabilities = require("lsp-options").capabilities -local on_attach = require("lsp-options").on_attach - -lsp.config("ruby_lsp", { - capabilities = capabilities, - on_attach = on_attach, +vim.lsp.config("ruby_lsp", { + capabilities = opts.capabilities, + on_attach = opts.on_attach, }) -- ── Enable configs ─────────────────────────────────────────────── -local enable = vim.lsp.enable -enable("ruby_lsp") +vim.lsp.enable("ruby_lsp") diff --git a/nvim/lua/plugins/lsp/ls/rust-analyzer.lua b/nvim/lua/plugins/lsp/ls/rust-analyzer.lua index cebeeb6..630801d 100644 --- a/nvim/lua/plugins/lsp/ls/rust-analyzer.lua +++ b/nvim/lua/plugins/lsp/ls/rust-analyzer.lua @@ -1,12 +1,9 @@ -- ┌ ┐ -- │ Rust │ -- └ ┘ -local lsp = vim.lsp +local opts = require("lsp-options") -local capabilities = require("lsp-options").capabilities -local on_attach = require("lsp-options").on_attach - -lsp.config("rust_analyzer", { +vim.lsp.config("rust_analyzer", { settings = { ["rust-analyzer"] = { diagnostics = { @@ -14,11 +11,10 @@ lsp.config("rust_analyzer", { }, }, }, - capabilities = capabilities, - on_attach = on_attach, + capabilities = opts.capabilities, + on_attach = opts.on_attach, }) -- ── Enable configs ─────────────────────────────────────────────── -local enable = vim.lsp.enable -enable("rust_analyzer") +vim.lsp.enable("rust_analyzer") diff --git a/nvim/lua/plugins/lsp/ls/sql.lua b/nvim/lua/plugins/lsp/ls/sql.lua index 28505aa..71b6573 100644 --- a/nvim/lua/plugins/lsp/ls/sql.lua +++ b/nvim/lua/plugins/lsp/ls/sql.lua @@ -1,17 +1,13 @@ -- ┌ ┐ -- │ SQL │ -- └ ┘ -local lsp = vim.lsp +local opts = require("lsp-options") -local capabilities = require("lsp-options").capabilities -local on_attach = require("lsp-options").on_attach - -lsp.config("postgres_lsp", { - capabilities = capabilities, - on_attach = on_attach, +vim.lsp.config("postgres_lsp", { + capabilities = opts.capabilities, + on_attach = opts.on_attach, }) -- ── Enable configs ─────────────────────────────────────────────── -local enable = vim.lsp.enable -enable("postgres_lsp") +vim.lsp.enable("postgres_lsp") diff --git a/nvim/lua/plugins/lsp/ls/text.lua b/nvim/lua/plugins/lsp/ls/text.lua index f312c92..587eac9 100644 --- a/nvim/lua/plugins/lsp/ls/text.lua +++ b/nvim/lua/plugins/lsp/ls/text.lua @@ -1,28 +1,24 @@ -- ┌ ┐ -- │ Text languages (TeX and MD) │ -- └ ┘ -local lsp = vim.lsp - -local capabilities = require("lsp-options").capabilities -local on_attach = require("lsp-options").on_attach +local opts = require("lsp-options") -- ┌ ┐ -- │ Markdown │ -- └ ┘ -lsp.config("marksman", { - capabilities = capabilities, - on_attach = on_attach, +vim.lsp.config("marksman", { + capabilities = opts.capabilities, + on_attach = opts.on_attach, }) -- ┌ ┐ -- │ LaTeX │ -- └ ┘ -lsp.config("texlab", { - capabilities = capabilities, - on_attach = on_attach, +vim.lsp.config("texlab", { + capabilities = opts.capabilities, + on_attach = opts.on_attach, }) -- ── Enable configs ─────────────────────────────────────────────── -local enable = vim.lsp.enable -enable("marksman") -enable("texlab") +vim.lsp.enable("marksman") +vim.lsp.enable("texlab") diff --git a/nvim/lua/plugins/lsp/ls/web.lua b/nvim/lua/plugins/lsp/ls/web.lua index 5623ef2..bf4cf38 100644 --- a/nvim/lua/plugins/lsp/ls/web.lua +++ b/nvim/lua/plugins/lsp/ls/web.lua @@ -1,44 +1,40 @@ -- ┌ ┐ -- │ Web technology │ -- └ ┘ -local lsp = vim.lsp - -local capabilities = require("lsp-options").capabilities -local on_attach = require("lsp-options").on_attach -local on_attach_no_formatting = require("lsp-options").on_attach_no_formatting +local opts = require("lsp-options") -- ┌ ┐ -- │ HTML, CSS, JSON │ -- └ ┘ -lsp.config("cssls", { - capabilities = capabilities, - on_attach = on_attach, +vim.lsp.config("cssls", { + capabilities = opts.capabilities, + on_attach = opts.on_attach, }) -lsp.config("html", { - capabilities = capabilities, - on_attach = on_attach, +vim.lsp.config("html", { + capabilities = opts.capabilities, + on_attach = opts.on_attach, }) -lsp.config("jsonls", { - capabilities = capabilities, - on_attach = on_attach, +vim.lsp.config("jsonls", { + capabilities = opts.capabilities, + on_attach = opts.on_attach, }) -- ┌ ┐ -- │ PHP │ -- └ ┘ -lsp.config("intelephense", { - capabilities = capabilities, - on_attach = on_attach, +vim.lsp.config("intelephense", { + capabilities = opts.capabilities, + on_attach = opts.on_attach, }) -- ┌ ┐ -- │ Vue │ -- └ ┘ -lsp.config("vue_ls", { - capabilities = capabilities, - on_attach = on_attach_no_formatting, +vim.lsp.config("vue_ls", { + capabilities = opts.capabilities, + on_attach = opts.on_attach_no_formatting, filetypes = { "vue", }, @@ -55,9 +51,9 @@ local vue_plugin = { -- ┌ ┐ -- │ TS, JS, TSX, JSX │ -- └ ┘ -lsp.config("vtsls", { - capabilities = capabilities, - on_attach = on_attach_no_formatting, +vim.lsp.config("vtsls", { + capabilities = opts.capabilities, + on_attach = opts.on_attach_no_formatting, filetypes = { "javascript", "typescript", @@ -79,17 +75,16 @@ lsp.config("vtsls", { -- ┌ ┐ -- │ nginx │ -- └ ┘ -lsp.config("nginx_language_server", { - capabilities = capabilities, - on_attach = on_attach, +vim.lsp.config("nginx_language_server", { + capabilities = opts.capabilities, + on_attach = opts.on_attach, }) -- ── Enable configs ─────────────────────────────────────────────── -local enable = vim.lsp.enable -enable("jsonls") -enable("html") -enable("cssls") -enable("intelephense") -enable("vtsls") -enable("vue_ls") -enable("nginx_language_server") +vim.lsp.enable("jsonls") +vim.lsp.enable("html") +vim.lsp.enable("cssls") +vim.lsp.enable("intelephense") +vim.lsp.enable("vtsls") +vim.lsp.enable("vue_ls") +vim.lsp.enable("nginx_language_server") diff --git a/nvim/lua/plugins/lsp/ls/yaml.lua b/nvim/lua/plugins/lsp/ls/yaml.lua index 1df77ba..e4df8f6 100644 --- a/nvim/lua/plugins/lsp/ls/yaml.lua +++ b/nvim/lua/plugins/lsp/ls/yaml.lua @@ -1,17 +1,13 @@ -- ┌ ┐ -- │ GitHub Actions │ -- └ ┘ -local lsp = vim.lsp +local opts = require("lsp-options") -local capabilities = require("lsp-options").capabilities -local on_attach = require("lsp-options").on_attach - -lsp.config("yamlls", { - capabilities = capabilities, - on_attach = on_attach, +vim.lsp.config("yamlls", { + capabilities = opts.capabilities, + on_attach = opts.on_attach, }) -- ── Enable configs ─────────────────────────────────────────────── -local enable = vim.lsp.enable -enable("yamlls") +vim.lsp.enable("yamlls") diff --git a/nvim/lua/plugins/lsp/lspconfig.lua b/nvim/lua/plugins/lsp/lspconfig.lua index ecc221e..c49b856 100755 --- a/nvim/lua/plugins/lsp/lspconfig.lua +++ b/nvim/lua/plugins/lsp/lspconfig.lua @@ -23,7 +23,6 @@ return { -- ╰───────────────────────────────────────────────╯ require("plugins.lsp.ls.bashls") require("plugins.lsp.ls.c") - require("plugins.lsp.ls.dart") require("plugins.lsp.ls.docker") require("plugins.lsp.ls.gh-actions") require("plugins.lsp.ls.go")