From ca047c1885c76e71ce19ac7022df6c94b5bca9e7 Mon Sep 17 00:00:00 2001 From: cy Date: Sat, 25 Jan 2025 09:47:52 -0500 Subject: [PATCH 1/2] add beta nix cache Signed-off-by: cy --- 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" ]; }; } From 5fc61d955bf52a66befa891582e8d2b4f6fc6b0a Mon Sep 17 00:00:00 2001 From: cy Date: Sat, 25 Jan 2025 17:24:02 -0500 Subject: [PATCH 2/2] flake update Signed-off-by: cy --- flake.lock | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/flake.lock b/flake.lock index b775756..bb0643e 100644 --- a/flake.lock +++ b/flake.lock @@ -120,11 +120,11 @@ "rocksdb": "rocksdb" }, "locked": { - "lastModified": 1737792515, - "narHash": "sha256-+mR9BsX2a+RBFMcWXIrRnwHnR8bpPL6vuhaFfSshGJY=", + "lastModified": 1737830431, + "narHash": "sha256-C/tkJeSefIAK9wke33HBvxCoBF/hqa+1+oPaLriOrNE=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "cd5d4f48bec719a938f50cb17b667668105a1141", + "rev": "9514064c1c709dc7c437b1478b224bb0d711ec05", "type": "github" }, "original": { @@ -255,11 +255,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1737700483, - "narHash": "sha256-1778bR4GDDc51/iZQvcshGLZ4JU87zCzqei8Hn7vU1A=", + "lastModified": 1737786656, + "narHash": "sha256-ubCW9Jy7ZUOF354bWxTgLDpVnTvIpNr6qR4H/j7I0oo=", "owner": "nix-community", "repo": "fenix", - "rev": "bab2a2840bc2d5ae7c6a133602185edbe4ca7daa", + "rev": "2f721f527886f801403f389a9cabafda8f1e3b7f", "type": "github" }, "original": { @@ -737,11 +737,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1737797805, - "narHash": "sha256-revbNiDQIhSwkAvGE2IVf3iSHbp1LB52KXu3nukATfE=", + "lastModified": 1737840481, + "narHash": "sha256-WjW3cdrmh1sGMT3CBqCFzT9BOktTa1u9ldoWEqTj7xk=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "ab19f1d6bf4b38558c84df4990ec0618ec526eb5", + "rev": "8fc9dba8df75d9d004d9369b513b81180788ec15", "type": "github" }, "original": { @@ -1082,11 +1082,11 @@ ] }, "locked": { - "lastModified": 1737747541, - "narHash": "sha256-dA54OnUCUtVZfnSuD1dAEcosZzx/tch9KvtDz/Y3FIo=", + "lastModified": 1737832569, + "narHash": "sha256-VkK73VRVgvSQOPw9qx9HzvbulvUM9Ae4nNd3xNP+pkI=", "owner": "nix-community", "repo": "nixvim", - "rev": "5fda6e093da13f37c63a5577888a668c38f30dc7", + "rev": "d7df58321110d3b0e12a829bbd110db31ccd34b1", "type": "github" }, "original": { @@ -1180,16 +1180,16 @@ "rocksdb": { "flake": false, "locked": { - "lastModified": 1737761947, - "narHash": "sha256-FqpAOeFGuA+luV36jaf5aVz3UB183n6wUrTbFxCwjjQ=", + "lastModified": 1737828695, + "narHash": "sha256-8Ev6zzhNPU798JNvU27a7gj5X+6SDG3jBweUkQ59DbA=", "owner": "girlbossceo", "repo": "rocksdb", - "rev": "d078ca31e802696b26d972bda7bed86ee1382156", + "rev": "a4d9230dcc9d03be428b9a728133f8f646c0065c", "type": "github" }, "original": { "owner": "girlbossceo", - "ref": "v9.10.0", + "ref": "v9.9.3", "repo": "rocksdb", "type": "github" } @@ -1219,11 +1219,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1737634189, - "narHash": "sha256-AG5G9KDsl0Ngby9EfWvlemma7WWG0KCADTIccPJuzUE=", + "lastModified": 1737728869, + "narHash": "sha256-U4pl3Hi0lT6GP4ecN3q9wdD2sdaKMbmD/5NJ1NdJ9AM=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "84d44d0a574630aa8500ed62b6c01ccd3fae2473", + "rev": "6e4c29f7ce18cea7d3d31237a4661ab932eab636", "type": "github" }, "original": { @@ -1343,11 +1343,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1736487362, - "narHash": "sha256-4kGoOA7FgK9N2mzS+TFEn41kUUNY6KwdiA/0rqlr868=", + "lastModified": 1737837494, + "narHash": "sha256-wIMowP8Juas4ZwMRcpc+58sZ0kKTDu8fm13THPmv/F8=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "8f55e27f63a749881c4bbfbb6b1da028342a91d1", + "rev": "3944c9a0e40e5629f16ad023bbc90dac80d35a0f", "type": "github" }, "original": {