Fix substituter order
This commit is contained in:
parent
72c1bab225
commit
9e754f2283
3 changed files with 6 additions and 5 deletions
|
@ -27,11 +27,11 @@ let
|
||||||
{
|
{
|
||||||
SSH =
|
SSH =
|
||||||
let
|
let
|
||||||
ssh = host: fork "kitty +kitten ssh ${host}";
|
ssh = host: "ssh ${host}";
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
hera = ssh "hera";
|
hera = ssh "hera";
|
||||||
remote-builder = ssh "phoibe.cysec.de";
|
remote-builder = ssh "phoibe.cased.de";
|
||||||
ag = ssh "ag-forward";
|
ag = ssh "ag-forward";
|
||||||
gwres1 = ssh "gw";
|
gwres1 = ssh "gw";
|
||||||
cysec = ssh "borg.cysec.de";
|
cysec = ssh "borg.cysec.de";
|
||||||
|
|
|
@ -48,11 +48,12 @@
|
||||||
lib.mkIf (!pkgs.withSecrets) { text = "echo No secrets loaded!; exit 1;"; };
|
lib.mkIf (!pkgs.withSecrets) { text = "echo No secrets loaded!; exit 1;"; };
|
||||||
|
|
||||||
nix = {
|
nix = {
|
||||||
binaryCaches =
|
binaryCaches = lib.mkAfter (
|
||||||
pkgs.privateValue [ ] "binary-caches"
|
pkgs.privateValue [ ] "binary-caches"
|
||||||
++ (
|
++ (
|
||||||
if config.networking.hostName != "hera" then [ "ssh-ng://nix-ssh@hera.m-0.eu?trusted=true" ] else [ ]
|
if config.networking.hostName != "hera" then [ "ssh-ng://nix-ssh@hera.m-0.eu?trusted=true" ] else [ ]
|
||||||
);
|
)
|
||||||
|
);
|
||||||
binaryCachePublicKeys =
|
binaryCachePublicKeys =
|
||||||
[
|
[
|
||||||
"ryantrinkle.com-1:JJiAKaRv9mWgpVAz8dwewnZe0AzzEAzPkagE9SP5NWI="
|
"ryantrinkle.com-1:JJiAKaRv9mWgpVAz8dwewnZe0AzzEAzPkagE9SP5NWI="
|
||||||
|
|
2
private
2
private
|
@ -1 +1 @@
|
||||||
Subproject commit fcb957e5b0f06abac7df6b7e0b54e5ce0fee7c6f
|
Subproject commit ef8207cacacb9d38b5d68ca31dbade5345d0cca5
|
Loading…
Reference in a new issue