Compare commits

..

No commits in common. "536eee36adb94c445087bd12637fda07e64ea35e" and "6e8d8b43c29cbcea8113fc35da8b271edbbcc06c" have entirely different histories.

3 changed files with 8 additions and 4 deletions

View file

@ -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

View file

@ -159,6 +159,10 @@ 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";

View file

@ -43,11 +43,11 @@ in
}; };
nix = { nix = {
buildMachines = builtins.map (vivariumBuilder: vivariumBuilderDefault // vivariumBuilder) vivariumBuilders; buildMachines = builtins.map (vivariumBuilder: vivariumBuilderDefault // vivariumBuilder) vivariumBuilders;
distributedBuilds = false; distributedBuilds = true;
settings = { settings = {
builders-use-substitutes = true; builders-use-substitutes = true;
trusted-public-keys = publicKeys; trusted-public-keys = publicKeys;
trusted-substituters = builtins.map (builder: "${builder.protocol}://${builder.sshUser}@${builder.hostName}") config.nix.buildMachines; substituters = builtins.map (builder: "${builder.protocol}://${builder.sshUser}@${builder.hostName}") config.nix.buildMachines;
}; };
}; };
}; };