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

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

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

35
modules/plugins/languages/nix.nix
View file

@ -5,32 +5,18 @@
...
}: let
inherit (builtins) attrNames;
inherit (lib) concatStringsSep;
inherit (lib) concatStringsSep genAttrs;
inherit (lib.meta) getExe;
inherit (lib.options) mkEnableOption mkOption literalExpression;
inherit (lib.modules) mkIf mkMerge;
inherit (lib.types) enum;
inherit (lib.types) enum listOf;
inherit (lib.nvim.types) mkGrammarOption diagnostics deprecatedSingleOrListOf;
inherit (lib.nvim.attrsets) mapListToAttrs;
cfg = config.vim.languages.nix;
defaultServers = ["nil"];
servers = {
nil = {
enable = true;
cmd = [(getExe pkgs.nil)];
filetypes = ["nix"];
root_markers = [".git" "flake.nix"];
};
nixd = {
enable = true;
cmd = [(getExe pkgs.nixd)];
filetypes = ["nix"];
root_markers = [".git" "flake.nix"];
};
};
servers = ["nil" "nixd"];
defaultFormat = ["alejandra"];
formats = {
@ -91,7 +77,7 @@ in {
defaultText = literalExpression "config.vim.lsp.enable";
};
servers = mkOption {
type = deprecatedSingleOrListOf "vim.language.nix.lsp.servers" (enum (attrNames servers));
type = listOf (enum servers);
default = defaultServers;
description = "Nix LSP server to use";
};
@ -147,12 +133,13 @@ in {
})
(mkIf cfg.lsp.enable {
vim.lsp.servers =
mapListToAttrs (n: {
name = n;
value = servers.${n};
})
cfg.lsp.servers;
vim.lsp = {
presets = genAttrs cfg.lsp.servers (_: {enable = true;});
servers = genAttrs cfg.lsp.servers (_: {
filetypes = ["nix"];
root_markers = ["flake.nix"];
});
};
})
(mkIf cfg.format.enable {