NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2026-04-27 20:05:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

languages/bash: refactor lsp.servers to use lsp/presets/<name>

Browse source
This commit is contained in:
Snoweuph 2026-04-12 00:26:27 +02:00
commit 288f76c79e
No known key found for this signature in database
GPG key ID: BEFC41DA223CEC55
2 changed files with 13 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/manual/release-notes/rl-0.9.md
View file

@ -89,6 +89,8 @@
- Renamed `astro` to `astro-language-server`. - Renamed `astro` to `astro-language-server`.
- Renamed `bash-ls` to `bash-language-server`.
- Removed `languages.tailwind` which only provided an LSP. Use - Removed `languages.tailwind` which only provided an LSP. Use
`lsp.presets.tailwindcss-language-server` instead. `lsp.presets.tailwindcss-language-server` instead.

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

@ -8,27 +8,15 @@
inherit (lib.options) mkOption mkEnableOption literalExpression; inherit (lib.options) mkOption mkEnableOption literalExpression;
inherit (lib.meta) getExe; inherit (lib.meta) getExe;
inherit (lib.modules) mkIf mkMerge; inherit (lib.modules) mkIf mkMerge;
inherit (lib.types) enum bool; inherit (lib.types) enum bool listOf;
inherit (lib.generators) mkLuaInline; inherit (lib) genAttrs;
inherit (lib.nvim.types) diagnostics mkGrammarOption deprecatedSingleOrListOf; inherit (lib.nvim.types) diagnostics mkGrammarOption deprecatedSingleOrListOf;
inherit (lib.nvim.attrsets) mapListToAttrs; inherit (lib.nvim.attrsets) mapListToAttrs;
cfg = config.vim.languages.bash; cfg = config.vim.languages.bash;
defaultServers = ["bash-ls"]; defaultServers = ["bash-language-server"];
servers = { servers = ["bash-language-server"];
bash-ls = {
enable = true;
cmd = [(getExe pkgs.bash-language-server) "start"];
filetypes = ["bash" "sh"];
root_markers = [".git"];
settings = {
basheIde = {
globPattern = mkLuaInline "vim.env.GLOB_PATTERN or '*@(.sh|.inc|.bash|.command)'";
};
};
};
};
defaultFormat = ["shfmt"]; defaultFormat = ["shfmt"];
formats = { formats = {
@ -65,7 +53,7 @@ in {
defaultText = literalExpression "config.vim.lsp.enable"; defaultText = literalExpression "config.vim.lsp.enable";
}; };
servers = mkOption { servers = mkOption {
type = deprecatedSingleOrListOf "vim.language.bash.lsp.servers" (enum (attrNames servers)); type = listOf (enum servers);
default = defaultServers; default = defaultServers;
description = "Bash LSP server to use"; description = "Bash LSP server to use";
}; };
@ -107,12 +95,12 @@ in {
}) })
(mkIf cfg.lsp.enable { (mkIf cfg.lsp.enable {
vim.lsp.servers = vim.lsp = {
mapListToAttrs (n: { presets = genAttrs cfg.lsp.servers (_: {enable = true;});
name = n; servers = genAttrs cfg.lsp.servers (_: {
value = servers.${n}; filetypes = ["bash" "sh" "zsh"];
}) });
cfg.lsp.servers; };
}) })
(mkIf cfg.format.enable { (mkIf cfg.format.enable {