From a1be7f14fa9d1eaccfe3b2be2cd271114012ecb4 Mon Sep 17 00:00:00 2001 From: LordMZTE Date: Mon, 22 Jul 2024 18:12:31 +0200 Subject: [PATCH] nushell-plugins: remove redundant plugin removals --- nix/nushell-plugins.nix | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/nix/nushell-plugins.nix b/nix/nushell-plugins.nix index 8bfffd1..b83acf5 100644 --- a/nix/nushell-plugins.nix +++ b/nix/nushell-plugins.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, ... }: let nu-ver = "0.95.0"; -in +in { options.nushell-plugins = lib.mkOption { }; @@ -57,19 +57,14 @@ in }) ]; - config.output.packages.nushell-plugins = - let - pluginName = d: lib.removePrefix "nu-plugin-" d.name; - in - pkgs.writeTextFile { - name = "add-plugins.nu"; - text = builtins.concatStringsSep "\n" - (map - (d: - '' - if (plugin list | any { |p| $p.name == "${pluginName d}" }) { plugin rm ${pluginName d} } - plugin add ${lib.getBin d}/bin/${builtins.replaceStrings ["-"] ["_"] d.name} - '') - config.nushell-plugins); - }; + config.output.packages.nushell-plugins = pkgs.writeTextFile { + name = "add-plugins.nu"; + text = builtins.concatStringsSep "\n" + (map + (d: + '' + plugin add ${lib.getBin d}/bin/${builtins.replaceStrings ["-"] ["_"] d.name} + '') + config.nushell-plugins); + }; }