felschr/nixos-config
1
1
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix(neovim): improve bashls & shellcheck configuration

Browse source
This commit is contained in:
Felix Schröter 2023-04-09 21:36:47 +02:00
parent 9a4835e394
commit 73044da59e
Signed by: felschr
GPG key ID: 671E39E6744C807D
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
home/editors/neovim/lsp/lsp.lua
View file

@ -75,7 +75,6 @@ local default_config = {
capabilities = capabilities, capabilities = capabilities,
} }
config.bashls.setup(default_config)
config.jsonls.setup(default_config) config.jsonls.setup(default_config)
config.yamlls.setup(default_config) config.yamlls.setup(default_config)
config.html.setup(default_config) config.html.setup(default_config)
@ -91,6 +90,23 @@ config.bufls.setup(default_config)
config.vimls.setup(default_config) config.vimls.setup(default_config)
config.glslls.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 { config.rust_analyzer.setup {
on_attach = on_attach, on_attach = on_attach,
capabilities = capabilities, capabilities = capabilities,
@ -165,7 +181,6 @@ local null_ls_custom = {
null_ls.setup({ null_ls.setup({
sources = { sources = {
null_ls.builtins.diagnostics.shellcheck,
null_ls.builtins.diagnostics.statix, -- nix linter null_ls.builtins.diagnostics.statix, -- nix linter
null_ls.builtins.diagnostics.buf, null_ls.builtins.diagnostics.buf,
null_ls.builtins.diagnostics.eslint_d, null_ls.builtins.diagnostics.eslint_d,