diff options
| -rw-r--r-- | users/seth/programs/neovim/config/plugins/lsp.lua | 18 | ||||
| -rw-r--r-- | users/seth/programs/neovim/default.nix | 12 |
2 files changed, 9 insertions, 21 deletions
diff --git a/users/seth/programs/neovim/config/plugins/lsp.lua b/users/seth/programs/neovim/config/plugins/lsp.lua index 6f6a836..013d135 100644 --- a/users/seth/programs/neovim/config/plugins/lsp.lua +++ b/users/seth/programs/neovim/config/plugins/lsp.lua @@ -46,13 +46,11 @@ local formatting = null_ls.builtins.formatting local sources = { lsp_servers = { - "bashls", - "clangd", - "pyright", - "rust_analyzer", - "tsserver", - --"tailwindcss", - "nimls", + ["bashls"] = "bash-language-server", + ["clangd"] = "clangd", + ["pyright"] = "pyright-langserver", + ["rust_analyzer"] = "rust-analyzer", + ["tsserver"] = "typescript-language-server", }, null_ls = { diagnostics.actionlint, @@ -88,8 +86,10 @@ local all_config = { } local servers = {} -for _, server in ipairs(sources.lsp_servers) do - servers[server] = all_config +for server, binary in pairs(sources.lsp_servers) do + if vim.fn.executable(binary) == 1 then + servers[server] = all_config + end end servers["lua_ls"] = { diff --git a/users/seth/programs/neovim/default.nix b/users/seth/programs/neovim/default.nix index 327d840..68b9821 100644 --- a/users/seth/programs/neovim/default.nix +++ b/users/seth/programs/neovim/default.nix @@ -9,24 +9,12 @@ codespell deadnix just - llvmPackages_15.clang - llvmPackages_15.libclang nil nodePackages.alex - nodePackages.bash-language-server - nodePackages.eslint - nodePackages.prettier - nodePackages.pyright - nodePackages.typescript-language-server - pylint - rust-analyzer - rustfmt shellcheck - shellharden statix stylua sumneko-lua-language-server - yapf ]; plugins = with pkgs.vimPlugins; [ bufferline-nvim |