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

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

Browse source
This commit is contained in:
Snoweuph 2026-04-12 15:33:26 +02:00
commit 65f3b779c6
No known key found for this signature in database
GPG key ID: BEFC41DA223CEC55
1 changed files with 9 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

27
modules/plugins/languages/glsl.nix
View file

@ -4,25 +4,16 @@
pkgs, pkgs,
... ...
}: let }: let
inherit (builtins) attrNames;
inherit (lib.modules) mkIf mkMerge; inherit (lib.modules) mkIf mkMerge;
inherit (lib.nvim.types) mkGrammarOption; inherit (lib.nvim.types) mkGrammarOption;
inherit (lib.options) mkEnableOption mkOption literalExpression; inherit (lib.options) mkEnableOption mkOption literalExpression;
inherit (lib.types) enum listOf; inherit (lib.types) enum listOf;
inherit (lib.meta) getExe; inherit (lib) genAttrs;
inherit (lib.nvim.attrsets) mapListToAttrs;
cfg = config.vim.languages.glsl; cfg = config.vim.languages.glsl;
defaultServers = ["glsl_analyzer"]; defaultServers = ["glsl_analyzer"];
servers = { servers = ["glsl_analyzer"];
glsl_analyzer = {
enable = true;
cmd = [(getExe pkgs.glsl_analyzer)];
filetypes = ["glsl" "vert" "tesc" "tese" "frag" "geom" "comp"];
root_markers = [".git"];
};
};
in { in {
options.vim.languages.glsl = { options.vim.languages.glsl = {
enable = mkEnableOption "GLSL language support"; enable = mkEnableOption "GLSL language support";
@ -46,7 +37,7 @@ in {
}; };
servers = mkOption { servers = mkOption {
type = listOf (enum (attrNames servers)); type = listOf (enum servers);
default = defaultServers; default = defaultServers;
description = "GLSL LSP server to use"; description = "GLSL LSP server to use";
}; };
@ -62,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 = ["glsl" "vert" "tesc" "tese" "frag" "geom" "comp"];
}) });
cfg.lsp.servers; };
}) })
]); ]);
} }