From 0220f7f03fa8014b7f817ebaea73aa3833c23e95 Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Tue, 1 Nov 2022 16:03:30 +0100 Subject: [PATCH] nvim: Remove extraneous lsp setup for defaults --- nvim/.config/nvim/lua/plug/_lsp.lua | 64 +---------------------------- 1 file changed, 1 insertion(+), 63 deletions(-) diff --git a/nvim/.config/nvim/lua/plug/_lsp.lua b/nvim/.config/nvim/lua/plug/_lsp.lua index 9503e62..4bd08b7 100644 --- a/nvim/.config/nvim/lua/plug/_lsp.lua +++ b/nvim/.config/nvim/lua/plug/_lsp.lua @@ -1,65 +1,3 @@ -- The arch package defaults to the following directory -local sumneko_root_path = "/usr/share/lua-language-server" -require'navigator'.setup({ - lsp = { - servers = {'efm'}, - disable_lsp = {"pylsp", "jedi_language_server"}, - sumneko_lua = { - cmd = { - "lua-language-server", "-E", sumneko_root_path .. "/main.lua" - }, - settings = { - Lua = { - runtime = { - -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim) - version = 'LuaJIT', - -- Setup your lua path - path = vim.split(package.path, ';') - }, - diagnostics = { - -- Get the language server to recognize additional globals - globals = { - 'vim', 'before_each', 'after_each', 'describe', - 'it', 'mock', 'stub' - } - }, - workspace = { - -- Make the server aware of additional runtime files - library = { - [vim.fn.expand('$VIMRUNTIME/lua')] = true, - [vim.fn.expand('$VIMRUNTIME/lua/vim/lsp')] = true, - ["/usr/share/lua/5.1/busted/"] = true - } - } - } - } - }, - efm = { - init_options = { - documentFormatting = true, - codeAction = true, - completion = true, - documentSymbol = true, - hover = true - }, - filetypes = {"sh"}, - settings = { - rootMarkers = {".git/"}, - languages = { - sh = { - { - lintCommand = 'shellcheck -f gcc -x', - lintFormats = { - '%f:%l:%c: %trror: %m', - '%f:%l:%c: %tarning: %m', '%f:%l:%c: %tote: %m' - } - }, - {formatCommand = 'shfmt -ci -s -bn', formatStdin = true} - } - } - } - } - - } -}) +require'navigator'.setup() require"lsp_signature".setup()