NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2026-04-28 12:25:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Snoweuph 2026-04-11 23:44:30 +02:00
commit ba968b7385
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/just.nix
View file

@ -4,25 +4,16 @@
pkgs, pkgs,
... ...
}: let }: let
inherit (builtins) attrNames;
inherit (lib.options) literalExpression mkEnableOption mkOption; inherit (lib.options) literalExpression mkEnableOption mkOption;
inherit (lib.modules) mkIf mkMerge; inherit (lib.modules) mkIf mkMerge;
inherit (lib.meta) getExe; inherit (lib) genAttrs;
inherit (lib.types) enum listOf; inherit (lib.types) enum listOf;
inherit (lib.nvim.attrsets) mapListToAttrs;
inherit (lib.nvim.types) mkGrammarOption; inherit (lib.nvim.types) mkGrammarOption;
cfg = config.vim.languages.just; cfg = config.vim.languages.just;
defaultServers = ["just-lsp"]; defaultServers = ["just-lsp"];
servers = { servers = ["just-lsp"];
just-lsp = {
enable = true;
cmd = [(getExe pkgs.just-lsp)];
filetypes = ["just"];
root_markers = [".git" "justfile"];
};
};
in { in {
options.vim.languages.just = { options.vim.languages.just = {
enable = mkEnableOption "Just support"; enable = mkEnableOption "Just support";
@ -45,7 +36,7 @@ in {
defaultText = literalExpression "config.vim.lsp.enable"; defaultText = literalExpression "config.vim.lsp.enable";
}; };
servers = mkOption { servers = mkOption {
type = listOf (enum (attrNames servers)); type = listOf (enum servers);
default = defaultServers; default = defaultServers;
description = "Just LSP server to use"; description = "Just LSP server to use";
}; };
@ -61,12 +52,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 = ["just"];
}) });
cfg.lsp.servers; };
}) })
]); ]);
} }