NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2026-05-21 22:36:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

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

Browse source
This commit is contained in:
Snoweuph 2026-04-11 18:17:08 +02:00
commit c3b7ca7f26
No known key found for this signature in database
GPG key ID: BEFC41DA223CEC55
1 changed files with 11 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

41
modules/plugins/languages/nu.nix
View file

@ -5,32 +5,13 @@
... ...
}: let }: let
inherit (lib.options) mkEnableOption mkOption literalExpression; inherit (lib.options) mkEnableOption mkOption literalExpression;
inherit (lib.types) enum; inherit (lib.types) enum listOf;
inherit (lib.modules) mkIf mkMerge; inherit (lib.modules) mkIf mkMerge;
inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf; inherit (lib.nvim.types) mkGrammarOption;
inherit (lib.meta) getExe; inherit (lib) genAttrs;
inherit (lib.generators) mkLuaInline;
inherit (lib.nvim.attrsets) mapListToAttrs;
inherit (builtins) attrNames;
defaultServers = ["nushell"]; defaultServers = ["nushell"];
servers = { servers = ["nushell"];
nushell = {
enable = true;
cmd = [(getExe pkgs.nushell) "--no-config-file" "--lsp"];
filetypes = ["nu"];
root_dir =
mkLuaInline
/*
lua
*/
''
function(bufnr, on_dir)
on_dir(vim.fs.root(bufnr, { '.git' }) or vim.fs.dirname(vim.api.nvim_buf_get_name(bufnr)))
end
'';
};
};
cfg = config.vim.languages.nu; cfg = config.vim.languages.nu;
in { in {
@ -56,7 +37,7 @@ in {
}; };
servers = mkOption { servers = mkOption {
type = deprecatedSingleOrListOf "vim.language.nu.lsp.servers" (enum (attrNames servers)); type = listOf (enum servers);
default = defaultServers; default = defaultServers;
description = "Nu LSP server to use"; description = "Nu LSP server to use";
}; };
@ -70,12 +51,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 = ["nu"];
}) });
cfg.lsp.servers; };
}) })
]); ]);
} }