From a6792399f15710d4402f749adcc131d0d95fc74e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Fri, 31 Dec 2021 16:42:22 +0100 Subject: [PATCH] feat(ci): streamline definition --- ci.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/ci.nix b/ci.nix index 58b397a..25caf7d 100644 --- a/ci.nix +++ b/ci.nix @@ -11,20 +11,12 @@ let echo foo > ${nixpkgs.lib.escapeShellArg path} '') paths} ''; - nixPath = nixpkgs.lib.concatStringsSep ":" [ - "nixos-config=${toString ./.}/systems/${name}/configuration.nix" + nixPath = nixpkgs.lib.concatStringsSep ":" ([ "niveum=${toString ./.}" - "nixpkgs=${inputs.nixpkgs}" - "nixpkgs-unstable=${inputs.nixpkgs-unstable}" - "stockholm=${inputs.stockholm}" - "home-manager=${inputs.home-manager}" - "nix-writers=${inputs.nix-writers}" - "retiolum=${inputs.retiolum}" - "menstruation-backend=${inputs.menstruation-backend}" - "menstruation-telegram=${inputs.menstruation-telegram}" + "nixos-config=${toString ./.}/systems/${name}/configuration.nix" "system-secrets=${systemSecrets}" "secrets=${sharedSecrets}" - ]; + ] ++ nixpkgs.lib.mapAttrsToList (name: value: "${name}=${value}") inputs); # cd ~/.password-store/shared && find * -type f | sed 's/.gpg$//' sharedSecrets = ensureFiles [ "di.fm/key"