diff --git a/modules/dependencies.nix b/modules/dependencies.nix index 0a3668af..64d3c57a 100644 --- a/modules/dependencies.nix +++ b/modules/dependencies.nix @@ -40,6 +40,7 @@ let }; plantuml.default = "plantuml"; ripgrep.default = "ripgrep"; + rust-analyzer.default = "rust-analyzer"; sd.default = "sd"; sed.default = "gnused"; texpresso.default = "texpresso"; diff --git a/plugins/by-name/rustaceanvim/default.nix b/plugins/by-name/rustaceanvim/default.nix index fe935765..da06e742 100644 --- a/plugins/by-name/rustaceanvim/default.nix +++ b/plugins/by-name/rustaceanvim/default.nix @@ -15,11 +15,14 @@ lib.nixvim.plugins.mkNeovimPlugin { deprecateExtraOptions = true; optionsRenamedToSettings = import ./renamed-options.nix; - extraOptions = { - rustAnalyzerPackage = lib.mkPackageOption pkgs "rust-analyzer" { - nullable = true; - }; - }; + imports = [ + # TODO: added 2025-04-07, remove after 25.05 + (lib.nixvim.mkRemovedPackageOptionModule { + plugin = "godot"; + packageName = "rust-analyzer"; + oldPackageName = "rustAnalyzer"; + }) + ]; settingsOptions = import ./settings-options.nix { inherit lib helpers pkgs; }; @@ -53,7 +56,7 @@ lib.nixvim.plugins.mkNeovimPlugin { cfg: mkMerge [ { - extraPackages = [ cfg.rustAnalyzerPackage ]; + dependencies.rust-analyzer.enable = lib.mkDefault true; globals.rustaceanvim = cfg.settings;