From 6b1b5300cdc275422e1eab5cdc24b7f6f6798d1b Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Fri, 3 Oct 2025 12:39:18 +0000
Subject: [PATCH] home: vim: lspconfig: simplify LSP config

Despite what I just said in the previous commit, I decided to remove the
`is_executable` checks and always enable all servers.

I figured out that NeoVim actually handles `PATH` modifications pretty
well in this scenario: making a previously unavailable server executable
will automatically enable it.
---
 .../home/vim/plugin/settings/lspconfig.lua    | 73 +++++++------------
 1 file changed, 26 insertions(+), 47 deletions(-)

diff --git a/modules/home/vim/plugin/settings/lspconfig.lua b/modules/home/vim/plugin/settings/lspconfig.lua
index 68158b2..1596e84 100644
--- a/modules/home/vim/plugin/settings/lspconfig.lua
+++ b/modules/home/vim/plugin/settings/lspconfig.lua
@@ -30,38 +30,20 @@ vim.lsp.config("*", {
     on_attach = lsp.on_attach,
 })
 
--- C/C++
-if utils.is_executable("clangd") then
-    vim.lsp.enable("clangd")
-end
-
--- Haskell
-if utils.is_executable("haskell-language-server-wrapper") then
-    vim.lsp.enable("hls")
-end
-
--- Nix
-if utils.is_executable("nil") then
-    vim.lsp.enable("nil_ls")
-end
-
--- Python
-if utils.is_executable("pyright") then
-    vim.lsp.enable("pyright")
-end
-
-if utils.is_executable("ruff") then
-    vim.lsp.enable("ruff")
-end
-
--- Rust
-if utils.is_executable("rust-analyzer") then
-    vim.lsp.enable("rust_analyzer")
-end
-
--- Shell
-if utils.is_executable("bash-language-server") then
-    vim.lsp.config("bashls", {
+local servers = {
+    -- C/C++
+    clangd = {},
+    -- Haskell
+    hls = {},
+    -- Nix
+    nil_ls = {},
+    -- Python
+    pyright = {},
+    ruff = {},
+    -- Rust
+    rust_analyzer = {},
+    -- Shell
+    bashls = {
         filetypes = { "bash", "sh", "zsh" },
         settings = {
             bashIde = {
@@ -73,20 +55,17 @@ if utils.is_executable("bash-language-server") then
                 },
             },
         },
-    })
-    vim.lsp.enable("bashls")
-end
+    },
+    -- Starlark
+    starpls = {},
+    -- Generic
+    harper_ls = {},
+    typos_lsp = {},
+}
 
--- Starlark
-if utils.is_executable("starpls") then
-    vim.lsp.enable("starpls")
-end
-
--- Generic
-if utils.is_executable("harper-ls") then
-    vim.lsp.enable("harper_ls")
-end
-
-if utils.is_executable("typos-lsp") then
-    vim.lsp.enable("typos_lsp")
+for server, config in pairs(servers) do
+    if not vim.tbl_isempty(config) then
+        vim.lsp.config(server, config)
+    end
+    vim.lsp.enable(server)
 end