plugins/nixd: Adapt to new options

Note that due to the structure of the code we can't introduce
deprecation warnings, it results in:

  cannot find attribute `plugins.lsp.servers.nixd.settings.XXX`
This commit is contained in:
traxys 2024-05-05 19:08:52 +02:00
parent 2fd3a0493c
commit 908932b53c
3 changed files with 55 additions and 59 deletions

View file

@ -4,11 +4,13 @@
config,
pkgs,
...
}:
}@args:
with lib;
let
lspHelpers = import ../helpers.nix { inherit lib config pkgs; };
nixdSettings = import ./nixd.nix args;
servers = [
{
name = "ansiblels";
@ -408,6 +410,7 @@ let
description = "nixd for Nix";
package = pkgs.nixd;
settings = cfg: { nixd = cfg; };
settingsOptions = nixdSettings.options;
}
{
name = "nushell";
@ -660,10 +663,11 @@ in
imports = lib.lists.map lspHelpers.mkLsp servers ++ [
./ccls.nix
./efmls-configs.nix
./nixd.nix
./pylsp.nix
./rust-analyzer.nix
./svelte.nix
./vls.nix
];
config = lib.mkMerge [ nixdSettings.config ];
}