From 4111e327cd39da22219de7b56847c5fd62874568 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Tue, 27 Jul 2021 22:51:38 +0200 Subject: vim-dev: replace sumneko_lua -> nlua.nvim plugin --- dotfiles/vim-dev.lua | 9 +++++++++ usecases/desktop/development.nix | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dotfiles/vim-dev.lua b/dotfiles/vim-dev.lua index ae74e91..126b615 100644 --- a/dotfiles/vim-dev.lua +++ b/dotfiles/vim-dev.lua @@ -57,3 +57,12 @@ require("rust-tools").setup { on_attach = on_attach, } } + +require("nlua.lsp.nvim").setup(require('lspconfig'), { + cmd = { + string.format("%s/bin/lua-language-server", vim.g.sumneko_lua_base_path), + "-E", + string.format("%s/extras/main.lua", vim.g.sumneko_lua_base_path), + }, + on_attach = on_attach, +}) diff --git a/usecases/desktop/development.nix b/usecases/desktop/development.nix index 6dfd695..ae61d33 100644 --- a/usecases/desktop/development.nix +++ b/usecases/desktop/development.nix @@ -65,6 +65,7 @@ in vim = { extraPlugins = with vimPlugins; [ lsp_signature-nvim + nlua-nvim nvim-lspconfig rust-tools-nvim vim-grammarous @@ -72,13 +73,13 @@ in variables = { rust_analyzer_path = "${rust-analyzer-unwrapped}/bin/rust-analyzer"; + sumneko_lua_base_path = "${sumneko-lua-language-server}"; }; lsp = { clangd.cmd = [ "${clang-tools}/bin/clangd" "--resource-dir=${clang}/resource-root" ]; elixirls.cmd = [ "${elixir_ls}/bin/elixir-ls" ]; pylsp.cmd = [ "${python-lsp-server}/bin/pylsp" ]; - sumneko_lua.cmd = [ "${sumneko-lua-language-server}/bin/lua-language-server" ]; }; luaConfig = with lib; let -- cgit v1.2.3