From ca047c1885c76e71ce19ac7022df6c94b5bca9e7 Mon Sep 17 00:00:00 2001
From: cy <cy@cy7.sh>
Date: Sat, 25 Jan 2025 09:47:52 -0500
Subject: [PATCH] add beta nix cache

Signed-off-by: cy <cy@cy7.sh>
---
 flake.nix                 |  1 +
 hosts/chunk/tailscale.nix |  5 ++++-
 hosts/common.nix          | 21 +++++++++++++++++----
 hosts/ytnix/tailscale.nix |  1 +
 4 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/flake.nix b/flake.nix
index 77099f8..e27afc9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -89,6 +89,7 @@
       "https://nix-community.cachix.org"
       "https://cache.garnix.io"
       "https://cything.cachix.org"
+      "https://aseipp-nix-cache.global.ssl.fastly.net"
     ];
     extra-trusted-public-keys = [
       "central:uWhjva6m6dhC2hqNisjn2hXGvdGBs19vPkA1dPEuwFg="
diff --git a/hosts/chunk/tailscale.nix b/hosts/chunk/tailscale.nix
index b33da9c..fefc8e5 100644
--- a/hosts/chunk/tailscale.nix
+++ b/hosts/chunk/tailscale.nix
@@ -2,7 +2,10 @@
   services.tailscale = {
     enable = true;
     authKeyFile = config.sops.secrets."tailscale/auth".path;
-    extraUpFlags = [ "--advertise-exit-node" ];
+    extraUpFlags = [
+      "--advertise-exit-node"
+      "--accept-dns=false"
+    ];
     useRoutingFeatures = "server";
     openFirewall = true;
   };
diff --git a/hosts/common.nix b/hosts/common.nix
index 2e8b31a..c4bc548 100644
--- a/hosts/common.nix
+++ b/hosts/common.nix
@@ -9,8 +9,21 @@
         "root"
         "@wheel"
       ];
-      trusted-public-keys = [ "central:uWhjva6m6dhC2hqNisjn2hXGvdGBs19vPkA1dPEuwFg=" ];
-      substituters = [ "https://cache.cything.io/central" ];
+      trusted-public-keys = [
+        "central:uWhjva6m6dhC2hqNisjn2hXGvdGBs19vPkA1dPEuwFg="
+        "niri.cachix.org-1:Wv0OmO7PsuocRKzfDoJ3mulSl7Z6oezYhGhR+3W2964="
+        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+        "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
+        "cything.cachix.org-1:xqW1W5NNL+wrM9wfSELb0MLj/harD2ZyB4HbdaMyvPI="
+      ];
+      substituters = [
+        "https://aseipp-nix-cache.global.ssl.fastly.net"
+        "https://cache.cything.io/central"
+        "https://niri.cachix.org"
+        "https://nix-community.cachix.org"
+        "https://cache.garnix.io"
+        "https://cything.cachix.org"
+      ];
     };
     channel.enable = false;
     optimise = {
@@ -24,8 +37,8 @@
       options = "--delete-older-than 14d";
     };
     extraOptions = ''
-      	    builders-use-substitutes = true
-      	  '';
+      builders-use-substitutes = true
+    '';
     registry.nixpkgs.flake = inputs.nixpkgs;
   };
   time.timeZone = "America/Toronto";
diff --git a/hosts/ytnix/tailscale.nix b/hosts/ytnix/tailscale.nix
index 71d47c8..91d67bf 100644
--- a/hosts/ytnix/tailscale.nix
+++ b/hosts/ytnix/tailscale.nix
@@ -6,6 +6,7 @@
     useRoutingFeatures = "client";
     extraUpFlags = [
       "--exit-node=100.122.132.30"
+      "--accept-dns=false"
     ];
   };
 }