refactor(lsp): clean up config

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
+vim.lsp.config("bashls", {
-local on_attach = require("lsp-options").on_attach
+    capabilities = opts.capabilities,
-
+    on_attach = opts.on_attach,
-lsp.config("bashls", {
-    capabilities = capabilities,
-    on_attach = on_attach,
 })
 
 
 -- ── Enable configs ───────────────────────────────────────────────
-local enable = vim.lsp.enable
+vim.lsp.enable("bashls")
-enable("bashls")

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
+vim.lsp.enable("clangd")
-enable("clangd")

nvim/lua/plugins/lsp/ls/dart.lua

@@ -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")

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
+vim.lsp.config("docker_language_server", {
-local on_attach = require("lsp-options").on_attach
+    capabilities = opts.capabilities,
-
+    on_attach = opts.on_attach,
-lsp.config("docker_language_server", {
-    capabilities = capabilities,
-    on_attach = on_attach,
 })
 
 
 -- ── Enable configs ───────────────────────────────────────────────
-local enable = vim.lsp.enable
+vim.lsp.enable("docker_language_server")
-enable("docker_language_server")
 vim.filetype.add({
     filename = {
         ["docker-compose.yml"] = { "yaml.docker-compose", { priority = 100 } },

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
+vim.lsp.config("gh_actions_ls", {
-local on_attach = require("lsp-options").on_attach
+    capabilities = opts.capabilities,
-
+    on_attach = opts.on_attach,
-lsp.config("gh_actions_ls", {
-    capabilities = capabilities,
-    on_attach = on_attach,
 	filetypes = {
 		"yaml.actions",
 	},
@@ -16,5 +13,4 @@ lsp.config("gh_actions_ls", {
 
 
 -- ── Enable configs ───────────────────────────────────────────────
-local enable = vim.lsp.enable
+vim.lsp.enable("gh_actions_ls")
-enable("gh_actions_ls")

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
+vim.lsp.config("gopls", {
-local on_attach = require("lsp-options").on_attach
+    capabilities = opts.capabilities,
-
+    on_attach = opts.on_attach,
-lsp.config("gopls", {
-    capabilities = capabilities,
-    on_attach = on_attach,
 })
 
 
 -- ── Enable configs ───────────────────────────────────────────────
-local enable = vim.lsp.enable
+vim.lsp.enable("gopls")
-enable("gopls")

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
+vim.lsp.config("hls", {
-local on_attach = require("lsp-options").on_attach
+    capabilities = opts.capabilities,
-
+    on_attach = opts.on_attach,
-lsp.config("hls", {
-    capabilities = capabilities,
-    on_attach = on_attach,
 })
 
 
 -- ── Enable configs ───────────────────────────────────────────────
-local enable = vim.lsp.enable
+vim.lsp.enable("hls")
-enable("hls")

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
+vim.lsp.config("hyprls", {
-local on_attach = require("lsp-options").on_attach
+    capabilities = opts.capabilities,
-
+    on_attach = opts.on_attach,
-lsp.config("hyprls", {
-    capabilities = capabilities,
-    on_attach = on_attach,
 })
 
 
 -- ── Enable configs ───────────────────────────────────────────────
-local enable = vim.lsp.enable
+vim.lsp.enable("hyprls")
-enable("hyprls")

nvim/lua/plugins/lsp/ls/low-level.lua

@@ -2,16 +2,14 @@
 -- │            Low-level (HDL and ASM)            │
 -- └                                               ┘
 local lsp = vim.lsp
-
+local opts = require("lsp-options")
-local capabilities = require("lsp-options").capabilities
-local on_attach = require("lsp-options").on_attach
 
 -- ┌                                               ┐
 -- │                      ASM                      │
 -- └                                               ┘
 lsp.config("asm_lsp", {
-    on_attach = on_attach,
+    on_attach = opts.on_attach,
-    capabilities = capabilities,
+    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,
+    capabilities = opts.capabilities,
-    on_attach = on_attach,
+    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,
+    capabilities = opts.capabilities,
-    on_attach = on_attach,
+    on_attach = opts.on_attach,
     root_dir = verilog_root_dir,
 })
 
-
 -- ── Enable configs ───────────────────────────────────────────────
 local enable = vim.lsp.enable
 enable("veridian")

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
+vim.lsp.config("lua_ls", {
-local on_attach = require("lsp-options").on_attach
+	capabilities = opts.capabilities,
-
+	on_attach = opts.on_attach,
-lsp.config("lua_ls", {
-	capabilities = capabilities,
-	on_attach = 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
+vim.lsp.enable("lua_ls")
-enable("lua_ls")

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
+vim.lsp.config("ocamllsp", {
-local on_attach = require("lsp-options").on_attach
+    capabilities = opts.capabilities,
-
+    on_attach = opts.on_attach,
-lsp.config("ocamllsp", {
-    capabilities = capabilities,
-    on_attach = 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
+vim.lsp.enable("ocamllsp")
-enable("ocamllsp")

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
+vim.lsp.config("pyright", {
-local on_attach = require("lsp-options").on_attach
+    capabilities = opts.capabilities,
-
+    on_attach = opts.on_attach,
-lsp.config("pyright", {
-    capabilities = capabilities,
-    on_attach = on_attach,
 })
 
 
 -- ── Enable configs ───────────────────────────────────────────────
-local enable = vim.lsp.enable
+vim.lsp.enable("pyright")
-enable("pyright")

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
+vim.lsp.config("qmlls", {
-local on_attach = require("lsp-options").on_attach
+	capabilities = opts.capabilities,
-
+	on_attach = opts.on_attach,
-lsp.config("qmlls", {
-	capabilities = capabilities,
-	on_attach = on_attach,
 	cmd = { "qmlls6" },
 })
 
 -- ── Enable configs ───────────────────────────────────────────────
-local enable = vim.lsp.enable
+vim.lsp.enable("qmlls")
-enable("qmlls")

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
+vim.lsp.config("ruby_lsp", {
-local on_attach = require("lsp-options").on_attach
+    capabilities = opts.capabilities,
-
+    on_attach = opts.on_attach,
-lsp.config("ruby_lsp", {
-    capabilities = capabilities,
-    on_attach = on_attach,
 })
 
 
 -- ── Enable configs ───────────────────────────────────────────────
-local enable = vim.lsp.enable
+vim.lsp.enable("ruby_lsp")
-enable("ruby_lsp")

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
+vim.lsp.config("rust_analyzer", {
-local on_attach = require("lsp-options").on_attach
-
-lsp.config("rust_analyzer", {
     settings = {
         ["rust-analyzer"] = {
             diagnostics = {
@@ -14,11 +11,10 @@ lsp.config("rust_analyzer", {
             },
         },
     },
-    capabilities = capabilities,
+    capabilities = opts.capabilities,
-    on_attach = on_attach,
+    on_attach = opts.on_attach,
 })
 
 
 -- ── Enable configs ───────────────────────────────────────────────
-local enable = vim.lsp.enable
+vim.lsp.enable("rust_analyzer")
-enable("rust_analyzer")

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
+vim.lsp.config("postgres_lsp", {
-local on_attach = require("lsp-options").on_attach
+    capabilities = opts.capabilities,
-
+    on_attach = opts.on_attach,
-lsp.config("postgres_lsp", {
-    capabilities = capabilities,
-    on_attach = on_attach,
 })
 
 
 -- ── Enable configs ───────────────────────────────────────────────
-local enable = vim.lsp.enable
+vim.lsp.enable("postgres_lsp")
-enable("postgres_lsp")

nvim/lua/plugins/lsp/ls/text.lua

@@ -1,28 +1,24 @@
 -- ┌                                               ┐
 -- │          Text languages (TeX and MD)          │
 -- └                                               ┘
-local lsp = vim.lsp
+local opts = require("lsp-options")
-
-local capabilities = require("lsp-options").capabilities
-local on_attach = require("lsp-options").on_attach
 
 -- ┌                                               ┐
 -- │                   Markdown                    │
 -- └                                               ┘
-lsp.config("marksman", {
+vim.lsp.config("marksman", {
-    capabilities = capabilities,
+    capabilities = opts.capabilities,
-    on_attach = on_attach,
+    on_attach = opts.on_attach,
 })
 
 -- ┌                                               ┐
 -- │                     LaTeX                     │
 -- └                                               ┘
-lsp.config("texlab", {
+vim.lsp.config("texlab", {
-    capabilities = capabilities,
+    capabilities = opts.capabilities,
-    on_attach = on_attach,
+    on_attach = opts.on_attach,
 })
 
 -- ── Enable configs ───────────────────────────────────────────────
-local enable = vim.lsp.enable
+vim.lsp.enable("marksman")
-enable("marksman")
+vim.lsp.enable("texlab")
-enable("texlab")

nvim/lua/plugins/lsp/ls/web.lua

@@ -1,44 +1,40 @@
 -- ┌                                               ┐
 -- │                Web technology                 │
 -- └                                               ┘
-local lsp = vim.lsp
+local opts = require("lsp-options")
-
-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
 
 -- ┌                                               ┐
 -- │                HTML, CSS, JSON                │
 -- └                                               ┘
-lsp.config("cssls", {
+vim.lsp.config("cssls", {
-	capabilities = capabilities,
+	capabilities = opts.capabilities,
-	on_attach = on_attach,
+	on_attach = opts.on_attach,
 })
 
-lsp.config("html", {
+vim.lsp.config("html", {
-	capabilities = capabilities,
+	capabilities = opts.capabilities,
-	on_attach = on_attach,
+	on_attach = opts.on_attach,
 })
 
-lsp.config("jsonls", {
+vim.lsp.config("jsonls", {
-	capabilities = capabilities,
+	capabilities = opts.capabilities,
-	on_attach = on_attach,
+	on_attach = opts.on_attach,
 })
 
 -- ┌                                               ┐
 -- │                      PHP                      │
 -- └                                               ┘
-lsp.config("intelephense", {
+vim.lsp.config("intelephense", {
-	capabilities = capabilities,
+	capabilities = opts.capabilities,
-	on_attach = on_attach,
+	on_attach = opts.on_attach,
 })
 
 -- ┌                                               ┐
 -- │                      Vue                      │
 -- └                                               ┘
-lsp.config("vue_ls", {
+vim.lsp.config("vue_ls", {
-	capabilities = capabilities,
+	capabilities = opts.capabilities,
-	on_attach = on_attach_no_formatting,
+	on_attach = opts.on_attach_no_formatting,
 	filetypes = {
 		"vue",
 	},
@@ -55,9 +51,9 @@ local vue_plugin = {
 -- ┌                                               ┐
 -- │               TS, JS, TSX, JSX                │
 -- └                                               ┘
-lsp.config("vtsls", {
+vim.lsp.config("vtsls", {
-	capabilities = capabilities,
+	capabilities = opts.capabilities,
-	on_attach = on_attach_no_formatting,
+	on_attach = opts.on_attach_no_formatting,
 	filetypes = {
 		"javascript",
 		"typescript",
@@ -79,17 +75,16 @@ lsp.config("vtsls", {
 -- ┌                                               ┐
 -- │                     nginx                     │
 -- └                                               ┘
-lsp.config("nginx_language_server", {
+vim.lsp.config("nginx_language_server", {
-	capabilities = capabilities,
+	capabilities = opts.capabilities,
-	on_attach = on_attach,
+	on_attach = opts.on_attach,
 })
 
 -- ── Enable configs ───────────────────────────────────────────────
-local enable = vim.lsp.enable
+vim.lsp.enable("jsonls")
-enable("jsonls")
+vim.lsp.enable("html")
-enable("html")
+vim.lsp.enable("cssls")
-enable("cssls")
+vim.lsp.enable("intelephense")
-enable("intelephense")
+vim.lsp.enable("vtsls")
-enable("vtsls")
+vim.lsp.enable("vue_ls")
-enable("vue_ls")
+vim.lsp.enable("nginx_language_server")
-enable("nginx_language_server")

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
+vim.lsp.config("yamlls", {
-local on_attach = require("lsp-options").on_attach
+    capabilities = opts.capabilities,
-
+    on_attach = opts.on_attach,
-lsp.config("yamlls", {
-    capabilities = capabilities,
-    on_attach = on_attach,
 })
 
 
 -- ── Enable configs ───────────────────────────────────────────────
-local enable = vim.lsp.enable
+vim.lsp.enable("yamlls")
-enable("yamlls")

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")