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/zig: refactor lsp.servers to use lsp/presets/<name>

Browse source
This commit is contained in:
Snoweuph 2026-04-11 12:40:20 +02:00
commit 31b017b601
No known key found for this signature in database
GPG key ID: BEFC41DA223CEC55
1 changed files with 12 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

33
modules/plugins/languages/zig.nix
View file

@ -7,23 +7,14 @@
inherit (builtins) attrNames; inherit (builtins) attrNames;
inherit (lib.options) mkEnableOption mkOption literalExpression; inherit (lib.options) mkEnableOption mkOption literalExpression;
inherit (lib.modules) mkIf mkMerge mkDefault; inherit (lib.modules) mkIf mkMerge mkDefault;
inherit (lib.types) bool package enum; inherit (lib) genAttrs;
inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf; inherit (lib.types) bool package enum listOf;
inherit (lib.meta) getExe; inherit (lib.nvim.types) mkGrammarOption;
inherit (lib.nvim.attrsets) mapListToAttrs;
cfg = config.vim.languages.zig; cfg = config.vim.languages.zig;
defaultServers = ["zls"]; defaultServers = ["zls"];
servers = { servers = ["zls"];
zls = {
enable = true;
cmd = [(getExe pkgs.zls)];
filetypes = ["zig" "zir"];
root_markers = ["zls.json" "build.zig" ".git"];
workspace_required = false;
};
};
# TODO: dap.adapter.lldb is duplicated when enabling the # TODO: dap.adapter.lldb is duplicated when enabling the
# vim.languages.clang.dap module. This does not cause # vim.languages.clang.dap module. This does not cause
@ -77,7 +68,7 @@ in {
}; };
servers = mkOption { servers = mkOption {
type = deprecatedSingleOrListOf "vim.language.zig.lsp.servers" (enum (attrNames servers)); type = listOf (enum servers);
default = defaultServers; default = defaultServers;
description = "Zig LSP server to use"; description = "Zig LSP server to use";
}; };
@ -115,13 +106,13 @@ in {
(mkIf cfg.lsp.enable { (mkIf cfg.lsp.enable {
vim = { vim = {
lsp.servers = lsp = {
mapListToAttrs (n: { presets = genAttrs cfg.lsp.servers (_: {enable = true;});
name = n; servers = genAttrs cfg.lsp.servers (_: {
value = servers.${n}; root_markers = ["build.zig"];
}) filetypes = ["zig" "zir"];
cfg.lsp.servers; });
};
# nvf handles autosaving already # nvf handles autosaving already
globals.zig_fmt_autosave = mkDefault 0; globals.zig_fmt_autosave = mkDefault 0;
}; };