From 7304558a9f1ad0e754670aebeec2ef9592ef540e Mon Sep 17 00:00:00 2001 From: Daniel Kempkens Date: Sat, 22 Jul 2023 22:56:25 +0200 Subject: [PATCH] Update deps --- home/config/nvim/plugins/lsp.fnl | 23 ++++++++++++----------- home/programs/nvim/default.nix | 1 - 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/home/config/nvim/plugins/lsp.fnl b/home/config/nvim/plugins/lsp.fnl index 496e078..cd569fc 100644 --- a/home/config/nvim/plugins/lsp.fnl +++ b/home/config/nvim/plugins/lsp.fnl @@ -71,14 +71,15 @@ (vim.tbl_extend :force default-config)))) (lsp.solargraph.setup (->> {:settings {:solargraph {:diagnostics true}}} (vim.tbl_extend :force default-config))) - (lsp.lua_ls.setup (->> {:cmd [:lua-language-server] - :root_dir (or (lsp.util.root_pattern :init.vim - :init.lua :.git) - (vim.loop.os_homedir)) - :settings {:Lua {:runtime {:version :LuaJIT - :path (vim.split package.path - ";")} - :diagnostics {:globals [:vim]} - :telemetry {:enable false}}}} - (vim.tbl_extend :force default-config))))) - + (when (= (vim.fn.executable :lua-language-server) 1) + (lsp.lua_ls.setup (->> {:cmd [:lua-language-server] + :root_dir (or (lsp.util.root_pattern :init.vim + :init.lua + :.git) + (vim.loop.os_homedir)) + :settings {:Lua {:runtime {:version :LuaJIT + :path (vim.split package.path + ";")} + :diagnostics {:globals [:vim]} + :telemetry {:enable false}}}} + (vim.tbl_extend :force default-config)))))) diff --git a/home/programs/nvim/default.nix b/home/programs/nvim/default.nix index 6a16684..f395a22 100644 --- a/home/programs/nvim/default.nix +++ b/home/programs/nvim/default.nix @@ -26,7 +26,6 @@ in # LSP fennel-ls - lua-language-server nil nodePackages.bash-language-server nodePackages.dockerfile-language-server-nodejs