From 2abccc22ac9ba1afd44f6c282359a8196fdf41ab Mon Sep 17 00:00:00 2001 From: Griffin Smith Date: Tue, 14 Jul 2020 15:36:19 -0400 Subject: chore(gs/system): reformat tvl.nix Change-Id: Icc2f953450956a01b32872e6575976e49f1be0b4 Reviewed-on: https://cl.tvl.fyi/c/depot/+/1167 Tested-by: BuildkiteCI Reviewed-by: glittershark --- users/glittershark/system/system/modules/tvl.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'users') diff --git a/users/glittershark/system/system/modules/tvl.nix b/users/glittershark/system/system/modules/tvl.nix index ffa63e3243..5291532338 100644 --- a/users/glittershark/system/system/modules/tvl.nix +++ b/users/glittershark/system/system/modules/tvl.nix @@ -2,15 +2,23 @@ { nix = { - binaryCaches = ["ssh://nix-ssh@whitby.tvl.fyi"]; - trustedBinaryCaches = ["ssh://nix-ssh@whitby.tvl.fyi"]; - binaryCachePublicKeys = ["cache.tvl.fyi:fd+9d1ceCPvDX/xVhcfv8nAa6njEhAGAEe+oGJDEeoc="]; + binaryCaches = [ + "ssh://nix-ssh@whitby.tvl.fyi" + "https://cache.nixos.org" + ]; + trustedBinaryCaches = [ + "ssh://nix-ssh@whitby.tvl.fyi" + "https://cache.nixos.org" + ]; + binaryCachePublicKeys = [ + "cache.tvl.fyi:fd+9d1ceCPvDX/xVhcfv8nAa6njEhAGAEe+oGJDEeoc=" + ]; }; programs.ssh.knownHosts.whitby = { hostNames = [ "whitby" "whitby.tvl.fyi" "49.12.129.211"]; publicKeyFile = pkgs.writeText "whitby.pub" '' - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILNh/w4BSKov0jdz3gKBc98tpoLta5bb87fQXWBhAl2I + ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILNh/w4BSKov0jdz3gKBc98tpoLta5bb87fQXWBhAl2I ''; }; } -- cgit 1.4.1