diff --git a/effects.nix b/effects.nix index a358ab0..a2fa22f 100644 --- a/effects.nix +++ b/effects.nix @@ -46,7 +46,7 @@ }: "cachix pin nrabulinski ${lib.escapeShellArg name} ${lib.escapeShellArg drv}") collected; in - hci-effects.runIf (herculesCI?branch && herculesCI.branch == "main") (hci-effects.mkEffect { + hci-effects.runIf (herculesCI.config.branch == "main") (hci-effects.mkEffect { secretsMap."cachix-token" = "cachix-token"; inputs = [pkgs.cachix]; userSetupScript = '' diff --git a/hosts/kogata/default.nix b/hosts/kogata/default.nix index 13c99a1..53ed015 100644 --- a/hosts/kogata/default.nix +++ b/hosts/kogata/default.nix @@ -1,5 +1,9 @@ { - configurations.darwin.kogata = {pkgs, lib, ...}: { + configurations.darwin.kogata = { + pkgs, + lib, + ... + }: { nixpkgs.system = "aarch64-darwin"; settei.user.config = { @@ -8,7 +12,7 @@ # TODO: Make it a settei module so it's easy to concatenate which pkgs are allowed nixpkgs.config.allowUnfreePredicate = pkg: - builtins.elem (lib.getName pkg) [ "teams" ]; + builtins.elem (lib.getName pkg) ["teams"]; environment.systemPackages = with pkgs; [teams]; common.hercules.enable = true;