1
0
Fork 0

Styx: Adjust to nix-darwin updates

This commit is contained in:
Daniel Kempkens 2022-08-22 21:15:44 +02:00
parent 9167e2b435
commit ca818ed4ce

View file

@ -12,31 +12,32 @@ in
]; ];
nix = { nix = {
binaryCaches = [ settings = {
"https://nix-community.cachix.org" experimental-features = [ "nix-command" "flakes" ];
"https://nifoc.cachix.org" extra-platforms = [ "x86_64-darwin" ];
] ++ optionals secret.nix-cache.nifoc.enabled [
secret.nix-cache.nifoc.s3Url
];
binaryCachePublicKeys = [ auto-optimise-store = true;
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" keep-derivations = true;
"nifoc.cachix.org-1:ymuftq7RgN/lf/iWXFK8gpwDSAGFaGBeliWe9u6q8II=" keep-outputs = true;
] ++ optionals secret.nix-cache.nifoc.enabled [
secret.nix-cache.nifoc.publicKeyValue
];
trustedUsers = [ substituters = [
"@admin" "https://nix-community.cachix.org"
]; "https://nifoc.cachix.org"
] ++ optionals secret.nix-cache.nifoc.enabled [
secret.nix-cache.nifoc.s3Url
];
extraOptions = '' trusted-public-keys = [
experimental-features = nix-command flakes "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
extra-platforms = x86_64-darwin "nifoc.cachix.org-1:ymuftq7RgN/lf/iWXFK8gpwDSAGFaGBeliWe9u6q8II="
keep-derivations = true ] ++ optionals secret.nix-cache.nifoc.enabled [
keep-outputs = true secret.nix-cache.nifoc.publicKeyValue
auto-optimise-store = true ];
'';
trusted-users = [ "@admin" ];
};
configureBuildUsers = true;
distributedBuilds = true; distributedBuilds = true;
@ -50,8 +51,6 @@ in
}; };
users = { users = {
nix.configureBuildUsers = true;
users.daniel = { users.daniel = {
home = "/Users/daniel"; home = "/Users/daniel";
}; };