diff --git a/flake.nix b/flake.nix index fdb5882..f8d8378 100644 --- a/flake.nix +++ b/flake.nix @@ -23,5 +23,5 @@ inherit nixos-hardware; }; }).config.system.build.isoImage; - }) (builtins.filter (x: x != null) (lib.attrsets.mapAttrsToList (key: value: if value == "regular" then ./nix/${key} else null) (builtins.readDir ./nix))); + }) (builtins.filter (x: x != null) (lib.attrsets.mapAttrsToList (key: value: if value == "regular" && lib.strings.hasInfix "iso" key then ./nix/${key} else null) (builtins.readDir ./nix))); } diff --git a/nix/common.nix b/nix/common.nix new file mode 100644 index 0000000..71f24ed --- /dev/null +++ b/nix/common.nix @@ -0,0 +1,12 @@ +{ ... }: + +{ + nix = { + binaryCaches = [ + "https://t2linux.cachix.org" + ]; + binaryCachePublicKeys = [ + "t2linux.cachix.org-1:P733c5Gt1qTcxsm+Bae0renWnT8OLs0u9+yfaK2Bejw=" + ]; + }; +} diff --git a/nix/t2-iso-gnome.nix b/nix/t2-iso-gnome.nix index ace4caa..72bca0d 100644 --- a/nix/t2-iso-gnome.nix +++ b/nix/t2-iso-gnome.nix @@ -5,6 +5,7 @@ "${modulesPath}/installer/cd-dvd/installation-cd-graphical-gnome.nix" "${modulesPath}/installer/cd-dvd/channel.nix" nixos-hardware.nixosModules.apple-t2 + ./common.nix ]; # Audio works better with PipeWire diff --git a/nix/t2-iso-minimal.nix b/nix/t2-iso-minimal.nix index fd18312..010850c 100644 --- a/nix/t2-iso-minimal.nix +++ b/nix/t2-iso-minimal.nix @@ -5,6 +5,7 @@ "${modulesPath}/installer/cd-dvd/installation-cd-minimal.nix" "${modulesPath}/installer/cd-dvd/channel.nix" nixos-hardware.nixosModules.apple-t2 + ./common.nix ]; # ZFS is broken and prevents building without this