diff --git a/ci/flake-cron.nix b/ci/flake-cron.nix index 0c9071a9..5150f7c9 100644 --- a/ci/flake-cron.nix +++ b/ci/flake-cron.nix @@ -13,6 +13,7 @@ with lib; { CACHIX_AUTH_TOKEN = "\${{ secrets.CACHIX_AUTH_TOKEN }}"; CACHIX_SIGNING_KEY = "\${{ secrets.CACHIX_SIGNING_KEY }}"; DISCORD_WEBHOOK_LINK = "\${{ secrets.DISCORD_WEBHOOK_LINK }}"; + NIX_INSTALLER = "--daemon"; NIX_CONFIG = "\${{ secrets.NIX_CONFIG }}"; }; on = let @@ -41,13 +42,9 @@ with lib; { order = 500; run = "nix run .#nf-update"; env = { - CACHIX_AUTH_TOKEN = "\${{ secrets.CACHIX_AUTH_TOKEN }}"; - CACHIX_SIGNING_KEY = "\${{ secrets.CACHIX_SIGNING_KEY }}"; - DISCORD_WEBHOOK_LINK = "\${{ secrets.DISCORD_WEBHOOK_LINK }}"; NF_UPDATE_GIT_COMMIT = "1"; NF_UPDATE_CACHIX_PUSH = "1"; NF_CONFIG_ROOT = "\${{ github.workspace }}"; - NIX_CONFIG = "\${{ secrets.NIX_CONFIG }}"; }; }; }; diff --git a/ci/nodes.nix b/ci/nodes.nix index 1de58cd1..e5e942b9 100644 --- a/ci/nodes.nix +++ b/ci/nodes.nix @@ -18,6 +18,7 @@ in { CACHIX_SIGNING_KEY = "\${{ secrets.CACHIX_SIGNING_KEY }}"; DISCORD_WEBHOOK_LINK = "\${{ secrets.DISCORD_WEBHOOK_LINK }}"; NIX_CONFIG = "\${{ secrets.NIX_CONFIG }}"; + NIX_INSTALLER = "--daemon"; }; on = let paths = [ @@ -42,10 +43,6 @@ in { order = 500; run = "nix run .#nf-build-system -- nixosConfigurations.${name}.config.system.build.toplevel ${name} NixOS"; env = { - NIX_CONFIG = "\${{ secrets.NIX_CONFIG }}"; - CACHIX_AUTH_TOKEN = "\${{ secrets.CACHIX_AUTH_TOKEN }}"; - CACHIX_SIGNING_KEY = "\${{ secrets.CACHIX_SIGNING_KEY }}"; - DISCORD_WEBHOOK_LINK = "\${{ secrets.DISCORD_WEBHOOK_LINK }}"; NF_UPDATE_CACHIX_PUSH = "1"; NF_CONFIG_ROOT = "\${{ github.workspace }}"; }; @@ -58,10 +55,6 @@ in { order = 500; run = "nix run .#nf-build-system -- homeConfigurations.${name}.activationPackage ${name} Home"; env = { - NIX_CONFIG = "\${{ secrets.NIX_CONFIG }}"; - CACHIX_AUTH_TOKEN = "\${{ secrets.CACHIX_AUTH_TOKEN }}"; - CACHIX_SIGNING_KEY = "\${{ secrets.CACHIX_SIGNING_KEY }}"; - DISCORD_WEBHOOK_LINK = "\${{ secrets.DISCORD_WEBHOOK_LINK }}"; NF_UPDATE_CACHIX_PUSH = "1"; NF_CONFIG_ROOT = "\${{ github.workspace }}"; };