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

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

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

30
modules/plugins/languages/jinja.nix
View file

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