NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2025-09-06 10:21:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

convert bash module

Browse source
This commit is contained in:
sjcobb 2025-06-02 23:56:40 +01:00
commit 52136af007
1 changed files with 20 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -10,26 +10,24 @@
inherit (lib.modules) mkIf mkMerge; inherit (lib.modules) mkIf mkMerge;
inherit (lib.lists) isList; inherit (lib.lists) isList;
inherit (lib.types) enum either package listOf str bool; inherit (lib.types) enum either package listOf str bool;
inherit (lib.generators) mkLuaInline;
inherit (lib.nvim.types) diagnostics mkGrammarOption; inherit (lib.nvim.types) diagnostics mkGrammarOption;
inherit (lib.nvim.lua) expToLua; inherit (lib.nvim.lua) expToLua;
cfg = config.vim.languages.bash; cfg = config.vim.languages.bash;
defaultServer = "bash-ls"; defaultServers = ["bash-ls"];
servers = { servers = {
bash-ls = { bash-ls = {
package = pkgs.bash-language-server; enable = true;
lspConfig = '' cmd = [(getExe pkgs.bash-language-server) "start"];
lspconfig.bashls.setup{ filetypes = ["bash" "sh"];
capabilities = capabilities; root_markers = [".git"];
on_attach = default_on_attach; settings = {
cmd = ${ basheIde = {
if isList cfg.lsp.package globPattern = mkLuaInline "vim.env.GLOB_PATTERN or '*@(.sh|.inc|.bash|.command)'";
then expToLua cfg.lsp.package };
else ''{"${cfg.lsp.package}/bin/bash-language-server", "start"}''
}; };
}
'';
}; };
}; };
@ -56,19 +54,11 @@ in {
}; };
lsp = { lsp = {
enable = mkEnableOption "Enable Bash LSP support" // {default = config.vim.lsp.enable;}; enable = mkEnableOption "Bash LSP support" // {default = config.vim.lsp.enable;};
servers = mkOption {
server = mkOption {
description = "Bash LSP server to use"; description = "Bash LSP server to use";
type = enum (attrNames servers); type = listOf (enum (attrNames servers));
default = defaultServer; default = defaultServers;
};
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;
}; };
}; };
@ -108,8 +98,12 @@ in {
}) })
(mkIf cfg.lsp.enable { (mkIf cfg.lsp.enable {
vim.lsp.lspconfig.enable = true; vim.lsp.servers =
vim.lsp.lspconfig.sources.bash-lsp = servers.${cfg.lsp.server}.lspConfig; mapListToAttrs (n: {
name = n;
value = servers.${n};
})
cfg.lsp.servers;
}) })
(mkIf cfg.format.enable { (mkIf cfg.format.enable {