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

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

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

32
modules/plugins/languages/wgsl.nix
View file

@ -4,26 +4,16 @@
pkgs, pkgs,
... ...
}: let }: let
inherit (builtins) attrNames;
inherit (lib.modules) mkIf mkMerge; inherit (lib.modules) mkIf mkMerge;
inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf; inherit (lib.nvim.types) mkGrammarOption;
inherit (lib.options) mkEnableOption mkOption literalExpression; inherit (lib.options) mkEnableOption mkOption literalExpression;
inherit (lib.types) enum; inherit (lib.types) enum listOf;
inherit (lib.meta) getExe; inherit (lib) genAttrs;
inherit (lib.nvim.attrsets) mapListToAttrs;
cfg = config.vim.languages.wgsl; cfg = config.vim.languages.wgsl;
defaultServers = ["wgsl-analyzer"]; defaultServers = ["wgsl-analyzer"];
servers = { servers = ["wgsl-analyzer"];
wgsl-analyzer = {
enable = true;
cmd = [(getExe pkgs.wgsl-analyzer)];
filetypes = ["wgsl"];
root_markers = [".git"];
settings = {};
};
};
in { in {
options.vim.languages.wgsl = { options.vim.languages.wgsl = {
enable = mkEnableOption "WGSL language support"; enable = mkEnableOption "WGSL language support";
@ -47,7 +37,7 @@ in {
}; };
servers = mkOption { servers = mkOption {
type = deprecatedSingleOrListOf "vim.language.wgsl.lsp.servers" (enum (attrNames servers)); type = listOf (enum servers);
default = defaultServers; default = defaultServers;
description = "WGSL LSP server to use"; description = "WGSL LSP server to use";
}; };
@ -63,12 +53,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 = ["wgsl"];
}) });
cfg.lsp.servers; };
}) })
]); ]);
} }