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

convert wgsl module

Browse source
This commit is contained in:
sjcobb 2025-07-11 14:15:51 +01:00
commit d2f41e2918
1 changed files with 20 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5,31 +5,23 @@
... ...
}: let }: let
inherit (builtins) attrNames; inherit (builtins) attrNames;
inherit (lib.lists) isList;
inherit (lib.modules) mkIf mkMerge; inherit (lib.modules) mkIf mkMerge;
inherit (lib.nvim.lua) expToLua;
inherit (lib.nvim.types) mkGrammarOption; inherit (lib.nvim.types) mkGrammarOption;
inherit (lib.options) literalExpression mkEnableOption mkOption; inherit (lib.options) mkEnableOption mkOption;
inherit (lib.types) either enum listOf package str; inherit (lib.types) enum listOf;
inherit (lib.meta) getExe;
inherit (lib.nvim.attrsets) mapListToAttrs;
cfg = config.vim.languages.wgsl; cfg = config.vim.languages.wgsl;
defaultServer = "wgsl-analyzer"; defaultServers = ["wgsl_analyzer"];
servers = { servers = {
wgsl-analyzer = { wgsl_analyzer = {
package = pkgs.wgsl-analyzer; enable = true;
internalFormatter = true; cmd = [(getExe pkgs.wgsl-analyzer)];
lspConfig = '' filetypes = ["wgsl"];
lspconfig.wgsl_analyzer.setup { root_markers = [".git"];
capabilities = capabilities, settings = {};
on_attach = default_on_attach,
cmd = ${
if isList cfg.lsp.package
then expToLua cfg.lsp.package
else "{'${cfg.lsp.package}/bin/wgsl_analyzer'}"
}
}
'';
}; };
}; };
in { in {
@ -44,18 +36,11 @@ in {
lsp = { lsp = {
enable = mkEnableOption "WGSL LSP support" // {default = config.vim.lsp.enable;}; enable = mkEnableOption "WGSL LSP support" // {default = config.vim.lsp.enable;};
server = mkOption { servers = mkOption {
type = enum (attrNames servers); type = listOf (enum (attrNames servers));
default = defaultServer; default = defaultServers;
description = "WGSL LSP server to use"; description = "WGSL LSP server to use";
}; };
package = mkOption {
description = "wgsl-analyzer package, or the command to run as a list of strings";
example = literalExpression "[(lib.getExe pkgs.wgsl-analyzer)]";
type = either package (listOf str);
default = pkgs.wgsl-analyzer;
};
}; };
}; };
@ -68,12 +53,12 @@ in {
}) })
(mkIf cfg.lsp.enable { (mkIf cfg.lsp.enable {
vim = { vim.lsp.servers =
lsp.lspconfig = { mapListToAttrs (n: {
enable = true; name = n;
sources.wgsl_analyzer = servers.${cfg.lsp.server}.lspConfig; value = servers.${n};
}; })
}; cfg.lsp.servers;
}) })
]); ]);
} }