mirror of
https://github.com/nix-community/nixvim.git
synced 2025-11-08 19:46:06 +01:00
plugins/efmls-configs: use dependencies for efm-langserver
This commit is contained in:
parent
c40f1b0fbd
commit
593e8114cd
3 changed files with 18 additions and 13 deletions
|
|
@ -110,6 +110,7 @@ in
|
||||||
curl.default = "curl";
|
curl.default = "curl";
|
||||||
direnv.default = "direnv";
|
direnv.default = "direnv";
|
||||||
distant.default = "distant";
|
distant.default = "distant";
|
||||||
|
efm-langserver.default = "efm-langserver";
|
||||||
fish.default = "fish";
|
fish.default = "fish";
|
||||||
flutter.default = "flutter";
|
flutter.default = "flutter";
|
||||||
fzf = {
|
fzf = {
|
||||||
|
|
|
||||||
|
|
@ -20,10 +20,6 @@ in
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
efmLangServerPackage = lib.mkPackageOption pkgs "efm-langserver" {
|
|
||||||
nullable = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
externallyManagedPackages = lib.mkOption {
|
externallyManagedPackages = lib.mkOption {
|
||||||
type = with lib.types; either (enum [ "all" ]) (listOf str);
|
type = with lib.types; either (enum [ "all" ]) (listOf str);
|
||||||
description = ''
|
description = ''
|
||||||
|
|
@ -199,11 +195,21 @@ in
|
||||||
config.settings.languages = setupOptions;
|
config.settings.languages = setupOptions;
|
||||||
};
|
};
|
||||||
|
|
||||||
extraPackages = [ cfg.efmLangServerPackage ] ++ (map (v: cfg.toolPackages.${v}) nixvimPkgs.right);
|
extraPackages = map (name: cfg.toolPackages.${name}) nixvimPkgs.right;
|
||||||
|
dependencies.efm-langserver.enable = lib.mkDefault true;
|
||||||
};
|
};
|
||||||
|
|
||||||
imports = lib.singleton {
|
imports = [
|
||||||
# Propagate setup warnings
|
{
|
||||||
inherit (config.plugins.efmls-configs.setup) warnings;
|
# Propagate setup warnings
|
||||||
};
|
inherit (config.plugins.efmls-configs.setup) warnings;
|
||||||
|
}
|
||||||
|
|
||||||
|
# TODO: added 2025-10-23, remove after 26.05
|
||||||
|
(lib.nixvim.mkRemovedPackageOptionModule {
|
||||||
|
plugin = "efmls-configs";
|
||||||
|
oldPackageName = "efmLangServer";
|
||||||
|
packageName = "efm-langserver";
|
||||||
|
})
|
||||||
|
];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -134,9 +134,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
no-packages = {
|
no-packages = {
|
||||||
plugins.efmls-configs = {
|
plugins.efmls-configs.enable = true;
|
||||||
enable = true;
|
dependencies.efm-langserver.enable = false;
|
||||||
efmLangServerPackage = null;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue