From b140981d65335abd07ce313e058380243b827823 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 28 Dec 2023 04:33:01 +0800 Subject: [PATCH] plugins/rust-tools: Allow null serverPackage (#845) Some users might want to use rust-analyzer beta/nightly from their own nix develop shell. --- plugins/languages/rust.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/languages/rust.nix b/plugins/languages/rust.nix index 95a6cfe8..2c6d5d18 100644 --- a/plugins/languages/rust.nix +++ b/plugins/languages/rust.nix @@ -14,9 +14,9 @@ in { enable = mkEnableOption "rust tools plugins"; package = helpers.mkPackageOption "rust-tools" pkgs.vimPlugins.rust-tools-nvim; serverPackage = mkOption { - type = types.package; + type = with types; nullOr package; default = pkgs.rust-analyzer; - description = "Package to use for rust-analyzer"; + description = "Package to use for rust-analyzer. rust-analyzer will not be installed if this is set to `null`"; }; executor = @@ -133,7 +133,7 @@ in { }; config = mkIf cfg.enable { extraPlugins = with pkgs.vimPlugins; [nvim-lspconfig cfg.package]; - extraPackages = [cfg.serverPackage]; + extraPackages = optional (cfg.serverPackage != null) cfg.serverPackage; plugins.lsp.postConfig = let options =