Compare commits
3 commits
6e8d8b43c2
...
536eee36ad
Author | SHA1 | Date | |
---|---|---|---|
Geoffrey Frogeye | 536eee36ad | ||
Geoffrey Frogeye | 2a3624af09 | ||
Geoffrey Frogeye | 4ff4e0cc99 |
|
@ -4,9 +4,9 @@
|
||||||
networking.hostName = "curacao";
|
networking.hostName = "curacao";
|
||||||
};
|
};
|
||||||
imports = [
|
imports = [
|
||||||
./backup
|
# ./backup
|
||||||
./co2meter
|
./co2meter
|
||||||
./dedup
|
# ./dedup
|
||||||
./disko.nix
|
./disko.nix
|
||||||
./features.nix
|
./features.nix
|
||||||
./hardware.nix
|
./hardware.nix
|
||||||
|
|
|
@ -159,10 +159,6 @@ in
|
||||||
mountpoint = "/mnt/rapido";
|
mountpoint = "/mnt/rapido";
|
||||||
mountOptions = btrfs_args_ssd;
|
mountOptions = btrfs_args_ssd;
|
||||||
subvolumes = {
|
subvolumes = {
|
||||||
archlinux = {
|
|
||||||
mountpoint = "/mnt/old";
|
|
||||||
mountOptions = btrfs_args_ssd;
|
|
||||||
};
|
|
||||||
# Should be temporary, to make sure we can revert to Arch anytime
|
# Should be temporary, to make sure we can revert to Arch anytime
|
||||||
"home.nixos" = {
|
"home.nixos" = {
|
||||||
mountpoint = "/home";
|
mountpoint = "/home";
|
||||||
|
|
|
@ -43,11 +43,11 @@ in
|
||||||
};
|
};
|
||||||
nix = {
|
nix = {
|
||||||
buildMachines = builtins.map (vivariumBuilder: vivariumBuilderDefault // vivariumBuilder) vivariumBuilders;
|
buildMachines = builtins.map (vivariumBuilder: vivariumBuilderDefault // vivariumBuilder) vivariumBuilders;
|
||||||
distributedBuilds = true;
|
distributedBuilds = false;
|
||||||
settings = {
|
settings = {
|
||||||
builders-use-substitutes = true;
|
builders-use-substitutes = true;
|
||||||
trusted-public-keys = publicKeys;
|
trusted-public-keys = publicKeys;
|
||||||
substituters = builtins.map (builder: "${builder.protocol}://${builder.sshUser}@${builder.hostName}") config.nix.buildMachines;
|
trusted-substituters = builtins.map (builder: "${builder.protocol}://${builder.sshUser}@${builder.hostName}") config.nix.buildMachines;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue