NotAShelf/nvf
1
0
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2025-04-13 16:18:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

language/bash: migrate to vim.lsp.servers

Browse source
This commit is contained in:
Ching Pei Yang 2025-04-05 23:41:28 +02:00
parent 940f78fcb4
commit 583f436e6e
No known key found for this signature in database
GPG key ID: B3841364253DC4C8
1 changed files with 21 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
modules/plugins/languages/bash.nix
View file

@ -5,31 +5,28 @@
...
}: let
inherit (builtins) attrNames;
inherit (lib.options) mkOption mkEnableOption literalExpression;
inherit (lib.options) mkOption mkEnableOption;
inherit (lib.meta) getExe;
inherit (lib.modules) mkIf mkMerge;
inherit (lib.lists) isList;
inherit (lib.types) enum either package listOf str bool;
inherit (lib.types) enum package listOf bool;
inherit (lib.generators) mkLuaInline;
inherit (lib.nvim.types) diagnostics mkGrammarOption;
inherit (lib.nvim.lua) expToLua;
inherit (lib.nvim.attrsets) mapListToAttrs;
cfg = config.vim.languages.bash;
defaultServer = "bash-ls";
servers = {
bash-ls = {
package = pkgs.bash-language-server;
lspConfig = ''
lspconfig.bashls.setup{
capabilities = capabilities;
on_attach = default_on_attach;
cmd = ${
if isList cfg.lsp.package
then expToLua cfg.lsp.package
else ''{"${cfg.lsp.package}/bin/bash-language-server", "start"}''
bash-ls.options = {
cmd = [(getExe pkgs.bash-language-server) "start"];
settings = {
bashIde = {
globPattern =
mkLuaInline "vim.env.GLOB_PATTERN or '*@(.sh|.inc|.bash|.command)'";
};
}
'';
};
filetypes = ["sh" "bash"];
root_markers = [".git"];
};
};
@ -60,15 +57,8 @@ in {
server = mkOption {
description = "Bash LSP server to use";
type = enum (attrNames servers);
default = defaultServer;
};
package = mkOption {
description = "bash-language-server package, or the command to run as a list of strings";
example = literalExpression ''[lib.getExe pkgs.nodePackages.bash-language-server "start"]'';
type = either package (listOf str);
default = pkgs.bash-language-server;
type = listOf (enum (attrNames servers));
default = [defaultServer];
};
};
@ -108,8 +98,12 @@ in {
})
(mkIf cfg.lsp.enable {
vim.lsp.lspconfig.enable = true;
vim.lsp.lspconfig.sources.bash-lsp = servers.${cfg.lsp.server}.lspConfig;
vim.lsp.servers =
mapListToAttrs (name: {
inherit name;
value = servers.${name}.options;
})
cfg.lsp.server;
})
(mkIf cfg.format.enable {