diff options
| author | Griffin Smith <grfn@gws.fyi> | 2022-02-01T15·52-0500 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2022-02-01T15·58+0000 |
| commit | 6e3432383fe97e38ec14b096cc3fc2e73fcd598a (patch) | |
| tree | e04b9412839b7f940440d4eb8a1b7bf4e7b26558 /users/grfn | |
| parent | 1949c9fa24ddafd195faa4e4618cd4fd73d2b207 (diff) | |
chore(grfn/system): Rename deprecated nixos options r/3737
Change-Id: I2c519ac4a0e92312bbb90b2ecba063b7c06605ab Reviewed-on: https://cl.tvl.fyi/c/depot/+/5157 Tested-by: BuildkiteCI Reviewed-by: grfn <grfn@gws.fyi> Autosubmit: grfn <grfn@gws.fyi>
Diffstat (limited to 'users/grfn')
| -rw-r--r-- | users/grfn/system/system/modules/common.nix | 2 | ||||
| -rw-r--r-- | users/grfn/system/system/modules/tvl.nix | 26 |
2 files changed, 15 insertions, 13 deletions
diff --git a/users/grfn/system/system/modules/common.nix b/users/grfn/system/system/modules/common.nix index 635747d118..a7d5a62e68 100644 --- a/users/grfn/system/system/modules/common.nix +++ b/users/grfn/system/system/modules/common.nix @@ -61,7 +61,7 @@ with lib; }; nix = { - trustedUsers = [ "grfn" ]; + settings.trusted-users = [ "grfn" ]; distributedBuilds = true; gc = { diff --git a/users/grfn/system/system/modules/tvl.nix b/users/grfn/system/system/modules/tvl.nix index 959f8449f6..3c0326c664 100644 --- a/users/grfn/system/system/modules/tvl.nix +++ b/users/grfn/system/system/modules/tvl.nix @@ -15,21 +15,23 @@ builders-use-substitutes = true ''; - binaryCaches = [ - "https://cache.nixos.org" - "ssh://nix-ssh@whitby.tvl.fyi" - ]; - trustedBinaryCaches = [ - "https://cache.nixos.org" - "ssh://nix-ssh@whitby.tvl.fyi" - ]; - binaryCachePublicKeys = [ - "cache.tvl.fyi:fd+9d1ceCPvDX/xVhcfv8nAa6njEhAGAEe+oGJDEeoc=" - ]; + settings = { + substituters = [ + "https://cache.nixos.org" + "ssh://nix-ssh@whitby.tvl.fyi" + ]; + trusted-substituters = [ + "https://cache.nixos.org" + "ssh://nix-ssh@whitby.tvl.fyi" + ]; + trusted-public-keys = [ + "cache.tvl.fyi:fd+9d1ceCPvDX/xVhcfv8nAa6njEhAGAEe+oGJDEeoc=" + ]; + }; }; programs.ssh.knownHosts.whitby = { - hostNames = [ "whitby" "whitby.tvl.fyi" "49.12.129.211" ]; + extraHostNames = [ "whitby" "whitby.tvl.fyi" "49.12.129.211" ]; publicKeyFile = pkgs.writeText "whitby.pub" '' ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILNh/w4BSKov0jdz3gKBc98tpoLta5bb87fQXWBhAl2I ''; |