diff --git a/flake.lock b/flake.lock index bb0643e..b775756 100644 --- a/flake.lock +++ b/flake.lock @@ -120,11 +120,11 @@ "rocksdb": "rocksdb" }, "locked": { - "lastModified": 1737830431, - "narHash": "sha256-C/tkJeSefIAK9wke33HBvxCoBF/hqa+1+oPaLriOrNE=", + "lastModified": 1737792515, + "narHash": "sha256-+mR9BsX2a+RBFMcWXIrRnwHnR8bpPL6vuhaFfSshGJY=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "9514064c1c709dc7c437b1478b224bb0d711ec05", + "rev": "cd5d4f48bec719a938f50cb17b667668105a1141", "type": "github" }, "original": { @@ -255,11 +255,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1737786656, - "narHash": "sha256-ubCW9Jy7ZUOF354bWxTgLDpVnTvIpNr6qR4H/j7I0oo=", + "lastModified": 1737700483, + "narHash": "sha256-1778bR4GDDc51/iZQvcshGLZ4JU87zCzqei8Hn7vU1A=", "owner": "nix-community", "repo": "fenix", - "rev": "2f721f527886f801403f389a9cabafda8f1e3b7f", + "rev": "bab2a2840bc2d5ae7c6a133602185edbe4ca7daa", "type": "github" }, "original": { @@ -737,11 +737,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1737840481, - "narHash": "sha256-WjW3cdrmh1sGMT3CBqCFzT9BOktTa1u9ldoWEqTj7xk=", + "lastModified": 1737797805, + "narHash": "sha256-revbNiDQIhSwkAvGE2IVf3iSHbp1LB52KXu3nukATfE=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "8fc9dba8df75d9d004d9369b513b81180788ec15", + "rev": "ab19f1d6bf4b38558c84df4990ec0618ec526eb5", "type": "github" }, "original": { @@ -1082,11 +1082,11 @@ ] }, "locked": { - "lastModified": 1737832569, - "narHash": "sha256-VkK73VRVgvSQOPw9qx9HzvbulvUM9Ae4nNd3xNP+pkI=", + "lastModified": 1737747541, + "narHash": "sha256-dA54OnUCUtVZfnSuD1dAEcosZzx/tch9KvtDz/Y3FIo=", "owner": "nix-community", "repo": "nixvim", - "rev": "d7df58321110d3b0e12a829bbd110db31ccd34b1", + "rev": "5fda6e093da13f37c63a5577888a668c38f30dc7", "type": "github" }, "original": { @@ -1180,16 +1180,16 @@ "rocksdb": { "flake": false, "locked": { - "lastModified": 1737828695, - "narHash": "sha256-8Ev6zzhNPU798JNvU27a7gj5X+6SDG3jBweUkQ59DbA=", + "lastModified": 1737761947, + "narHash": "sha256-FqpAOeFGuA+luV36jaf5aVz3UB183n6wUrTbFxCwjjQ=", "owner": "girlbossceo", "repo": "rocksdb", - "rev": "a4d9230dcc9d03be428b9a728133f8f646c0065c", + "rev": "d078ca31e802696b26d972bda7bed86ee1382156", "type": "github" }, "original": { "owner": "girlbossceo", - "ref": "v9.9.3", + "ref": "v9.10.0", "repo": "rocksdb", "type": "github" } @@ -1219,11 +1219,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1737728869, - "narHash": "sha256-U4pl3Hi0lT6GP4ecN3q9wdD2sdaKMbmD/5NJ1NdJ9AM=", + "lastModified": 1737634189, + "narHash": "sha256-AG5G9KDsl0Ngby9EfWvlemma7WWG0KCADTIccPJuzUE=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "6e4c29f7ce18cea7d3d31237a4661ab932eab636", + "rev": "84d44d0a574630aa8500ed62b6c01ccd3fae2473", "type": "github" }, "original": { @@ -1343,11 +1343,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1737837494, - "narHash": "sha256-wIMowP8Juas4ZwMRcpc+58sZ0kKTDu8fm13THPmv/F8=", + "lastModified": 1736487362, + "narHash": "sha256-4kGoOA7FgK9N2mzS+TFEn41kUUNY6KwdiA/0rqlr868=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "3944c9a0e40e5629f16ad023bbc90dac80d35a0f", + "rev": "8f55e27f63a749881c4bbfbb6b1da028342a91d1", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index e27afc9..77099f8 100644 --- a/flake.nix +++ b/flake.nix @@ -89,7 +89,6 @@ "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 fefc8e5..b33da9c 100644 --- a/hosts/chunk/tailscale.nix +++ b/hosts/chunk/tailscale.nix @@ -2,10 +2,7 @@ services.tailscale = { enable = true; authKeyFile = config.sops.secrets."tailscale/auth".path; - extraUpFlags = [ - "--advertise-exit-node" - "--accept-dns=false" - ]; + extraUpFlags = [ "--advertise-exit-node" ]; useRoutingFeatures = "server"; openFirewall = true; }; diff --git a/hosts/common.nix b/hosts/common.nix index c4bc548..2e8b31a 100644 --- a/hosts/common.nix +++ b/hosts/common.nix @@ -9,21 +9,8 @@ "root" "@wheel" ]; - 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" - ]; + trusted-public-keys = [ "central:uWhjva6m6dhC2hqNisjn2hXGvdGBs19vPkA1dPEuwFg=" ]; + substituters = [ "https://cache.cything.io/central" ]; }; channel.enable = false; optimise = { @@ -37,8 +24,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 91d67bf..71d47c8 100644 --- a/hosts/ytnix/tailscale.nix +++ b/hosts/ytnix/tailscale.nix @@ -6,7 +6,6 @@ useRoutingFeatures = "client"; extraUpFlags = [ "--exit-node=100.122.132.30" - "--accept-dns=false" ]; }; }