From 1eade740bd5c653c15d4fb24f9c80dfff30c389d Mon Sep 17 00:00:00 2001 From: James Andariese Date: Wed, 28 Sep 2022 08:37:32 -0500 Subject: [PATCH] if cascade.source is not enabled, get cascade from gitlab --- common/cascade-source.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/common/cascade-source.nix b/common/cascade-source.nix index a13918e..164d4fc 100644 --- a/common/cascade-source.nix +++ b/common/cascade-source.nix @@ -47,7 +47,10 @@ config = with lib; { fi '') ]; - nix.nixPath = mkIf (config.cascade.source.set-nix-path && config.cascade.source.enable) [ "cascade=/usr/src/cascade" ]; + nix.nixPath = mkMerge [ + (mkIf (config.cascade.source.set-nix-path && config.cascade.source.enable) [ "cascade=/usr/src/cascade" ]) + (mkIf (!(config.cascade.source.set-nix-path && config.cascade.source.enable)) [ "cascade=https://gitlab.com/jamesandariese/cascade/-/archive/main/cascade-main.tar.gz" ]) + ]; }; }