From 73044da59e6c915b3cf448deb456b8707677a009 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Sun, 9 Apr 2023 21:36:47 +0200 Subject: [PATCH] fix(neovim): improve bashls & shellcheck configuration --- home/editors/neovim/lsp/lsp.lua | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/home/editors/neovim/lsp/lsp.lua b/home/editors/neovim/lsp/lsp.lua index 62b1791..396339e 100644 --- a/home/editors/neovim/lsp/lsp.lua +++ b/home/editors/neovim/lsp/lsp.lua @@ -75,7 +75,6 @@ local default_config = { capabilities = capabilities, } -config.bashls.setup(default_config) config.jsonls.setup(default_config) config.yamlls.setup(default_config) config.html.setup(default_config) @@ -91,6 +90,23 @@ config.bufls.setup(default_config) config.vimls.setup(default_config) config.glslls.setup(default_config) +config.bashls.setup { + on_attach = function(client, bufnr) + local bufname = vim.api.nvim_buf_get_name(bufnr) + -- disable bashls for .env files + if client.name == "bashls" + and bufname:match "%.env" ~= nil + and bufname:match "%.env.*" ~= nil + then + vim.lsp.stop_client(client.id) + return + end + + return on_attach() + end, + capabilities = capabilities, +} + config.rust_analyzer.setup { on_attach = on_attach, capabilities = capabilities, @@ -165,7 +181,6 @@ local null_ls_custom = { null_ls.setup({ sources = { - null_ls.builtins.diagnostics.shellcheck, null_ls.builtins.diagnostics.statix, -- nix linter null_ls.builtins.diagnostics.buf, null_ls.builtins.diagnostics.eslint_d,