t2-iso-minimal, t2-iso-gnome: use binary cache and keep common settings in common.nix
This commit is contained in:
parent
3f4b573ab9
commit
ea31491118
4 changed files with 15 additions and 1 deletions
|
|
@ -23,5 +23,5 @@
|
||||||
inherit nixos-hardware;
|
inherit nixos-hardware;
|
||||||
};
|
};
|
||||||
}).config.system.build.isoImage;
|
}).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)));
|
||||||
}
|
}
|
||||||
|
|
|
||||||
12
nix/common.nix
Normal file
12
nix/common.nix
Normal file
|
|
@ -0,0 +1,12 @@
|
||||||
|
{ ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
nix = {
|
||||||
|
binaryCaches = [
|
||||||
|
"https://t2linux.cachix.org"
|
||||||
|
];
|
||||||
|
binaryCachePublicKeys = [
|
||||||
|
"t2linux.cachix.org-1:P733c5Gt1qTcxsm+Bae0renWnT8OLs0u9+yfaK2Bejw="
|
||||||
|
];
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
@ -5,6 +5,7 @@
|
||||||
"${modulesPath}/installer/cd-dvd/installation-cd-graphical-gnome.nix"
|
"${modulesPath}/installer/cd-dvd/installation-cd-graphical-gnome.nix"
|
||||||
"${modulesPath}/installer/cd-dvd/channel.nix"
|
"${modulesPath}/installer/cd-dvd/channel.nix"
|
||||||
nixos-hardware.nixosModules.apple-t2
|
nixos-hardware.nixosModules.apple-t2
|
||||||
|
./common.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
# Audio works better with PipeWire
|
# Audio works better with PipeWire
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,7 @@
|
||||||
"${modulesPath}/installer/cd-dvd/installation-cd-minimal.nix"
|
"${modulesPath}/installer/cd-dvd/installation-cd-minimal.nix"
|
||||||
"${modulesPath}/installer/cd-dvd/channel.nix"
|
"${modulesPath}/installer/cd-dvd/channel.nix"
|
||||||
nixos-hardware.nixosModules.apple-t2
|
nixos-hardware.nixosModules.apple-t2
|
||||||
|
./common.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
# ZFS is broken and prevents building without this
|
# ZFS is broken and prevents building without this
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue