modules/dependencies: add rust-analyzer

This commit is contained in:
Gaetan Lepage 2025-04-07 23:46:17 +02:00 committed by nix-infra-bot
parent e7c9cc7133
commit 9bc29e6a9b
2 changed files with 10 additions and 6 deletions

View file

@ -40,6 +40,7 @@ let
}; };
plantuml.default = "plantuml"; plantuml.default = "plantuml";
ripgrep.default = "ripgrep"; ripgrep.default = "ripgrep";
rust-analyzer.default = "rust-analyzer";
sd.default = "sd"; sd.default = "sd";
sed.default = "gnused"; sed.default = "gnused";
texpresso.default = "texpresso"; texpresso.default = "texpresso";

View file

@ -15,11 +15,14 @@ lib.nixvim.plugins.mkNeovimPlugin {
deprecateExtraOptions = true; deprecateExtraOptions = true;
optionsRenamedToSettings = import ./renamed-options.nix; optionsRenamedToSettings = import ./renamed-options.nix;
extraOptions = { imports = [
rustAnalyzerPackage = lib.mkPackageOption pkgs "rust-analyzer" { # TODO: added 2025-04-07, remove after 25.05
nullable = true; (lib.nixvim.mkRemovedPackageOptionModule {
}; plugin = "godot";
}; packageName = "rust-analyzer";
oldPackageName = "rustAnalyzer";
})
];
settingsOptions = import ./settings-options.nix { inherit lib helpers pkgs; }; settingsOptions = import ./settings-options.nix { inherit lib helpers pkgs; };
@ -53,7 +56,7 @@ lib.nixvim.plugins.mkNeovimPlugin {
cfg: cfg:
mkMerge [ mkMerge [
{ {
extraPackages = [ cfg.rustAnalyzerPackage ]; dependencies.rust-analyzer.enable = lib.mkDefault true;
globals.rustaceanvim = cfg.settings; globals.rustaceanvim = cfg.settings;