From ea7cd66043f95075b8c3a9987700f6734e06c0f3 Mon Sep 17 00:00:00 2001 From: Quinn Unger Date: Mon, 14 Sep 2026 19:52:12 +0100 Subject: [PATCH] fix substituter config --- flake.lock | 88 +++++++++++++++--------------- flake.nix | 2 +- nixosModules/distributedBuilds.nix | 19 ++++--- 3 files changed, 55 insertions(+), 54 deletions(-) diff --git a/flake.lock b/flake.lock index 2d8b423..82520b6 100644 --- a/flake.lock +++ b/flake.lock @@ -436,11 +436,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1789339225, - "narHash": "sha256-/HZftQQUt/oPJ+cYHii8bz6O/5Jo+LwG7fvJTstEzlk=", + "lastModified": 1789403066, + "narHash": "sha256-+k0cjXFFbKV8tZY+ypaE3ILEufDxaDtwqcGZXJPHNtE=", "ref": "refs/heads/main", - "rev": "8aaef3f7b5eb502ef48cc024550c2295fd141afd", - "revCount": 58, + "rev": "aeb6143d1c501b1397221c682d7050a4395c806a", + "revCount": 61, "type": "git", "url": "https://knot.moppu.dev/did:plc:hv3kvjufxykn2w4mriztfkhj/" }, @@ -456,11 +456,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1789257930, - "narHash": "sha256-BdYa4xcOnqeBHQsb/Alemek+2bD7JSrTNL55aXs10PM=", + "lastModified": 1789344154, + "narHash": "sha256-cwRBONt2p2aVU7ItMXKqa6tIDKOErqkQKDR0WVHD3eI=", "ref": "refs/heads/main", - "rev": "17055c57b0194099ef38b9ba0208e7dccdc11147", - "revCount": 188, + "rev": "eff47aebab7ea25128aba1c83fd447c46ba65aa4", + "revCount": 189, "type": "git", "url": "https://codeberg.org/bananad3v/niri-nix" }, @@ -494,11 +494,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1789244303, - "narHash": "sha256-ZymbkFBfgzMXbENnBzopIZ9LkrnJi6ytRABIzjCqEbk=", + "lastModified": 1789308908, + "narHash": "sha256-rKf+kiqygvn1DjpNRlHVkbXnABLGpd/N6Gg+t2POEQM=", "owner": "YaLTeR", "repo": "niri", - "rev": "849c576ffc902c9a6f249d9371a1e95fb63cf553", + "rev": "66d04a7d72e25a6c74307bab33a91924d124755d", "type": "github" }, "original": { @@ -514,11 +514,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1789186457, - "narHash": "sha256-K0ET+ydDFWxUrn6IpYsDmPc7v18wM3ren/iaUM2Aidk=", + "lastModified": 1789360421, + "narHash": "sha256-w3BTWJmfkrLKrrG5FS4LPElLoRmmRoWttWwjJUlpoGA=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "055bab29a0bf539092407ae65bd5e9f299394ddb", + "rev": "72a02f71884c54d6123261fd420b1f7d068ee3e7", "type": "github" }, "original": { @@ -550,11 +550,11 @@ "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1789273129, - "narHash": "sha256-uZvnQcnbpnlIBeL34bDzVpKAL5jLdMr4AcZ1IqLT+BY=", + "lastModified": 1789360006, + "narHash": "sha256-qdXKYk7gEuUIuOCQ/KuMIJyx4EriuALzaI+eK4vBK0I=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "522a367553c5dc6c970ed61ddee2b2cf8f8c678e", + "rev": "47789e27b5a7a147c6f4c70d5e40ac5636417ab4", "type": "github" }, "original": { @@ -589,11 +589,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1789271433, - "narHash": "sha256-6oF7WNb5nF3JPUELc+3X0+b1wSD0elrQ86yDpqzSjMU=", + "lastModified": 1789356821, + "narHash": "sha256-SeRElgFQ/y459z/wFaQckqRj3R1sYdVFiSXD9iZmd+Y=", "owner": "nix-community", "repo": "nixpkgs-xr", - "rev": "aca9ff2e9b63a6d90fccaab0517753d6c920b0ee", + "rev": "d50c355c30ddae1e07109d7777ccc6b0e9f3022f", "type": "github" }, "original": { @@ -604,11 +604,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1789114715, - "narHash": "sha256-ugpsyk3NM2s87vXfUiIIiibbJ4Pp0JPS5p/3mfs+q+c=", + "lastModified": 1789344334, + "narHash": "sha256-vdhpDJ3Lr24lkZ+fDCjmBRRtw9/vcSzkqGJOJyF5h2U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "21a67dc470149f337cecafbe965d8d252a390518", + "rev": "c3eea5b2156db11c7eeeada3dc737711255b253e", "type": "github" }, "original": { @@ -662,11 +662,11 @@ }, "nixpkgs_14": { "locked": { - "lastModified": 1789149629, - "narHash": "sha256-H6GwaZzZf+4npqv0tph94w9tZddSjFjmQrVsW0z78uk=", + "lastModified": 1789286504, + "narHash": "sha256-eiEK7cKZORNEvX0GeF3RtNEF/JXhgf2RqSp3230q13E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "eaad089433ca2bb662274377d33df3d0e51ef28b", + "rev": "ef34387ddd751e1ab8857adf4676492d32eb24ec", "type": "github" }, "original": { @@ -854,11 +854,11 @@ "nixpkgs": "nixpkgs_12" }, "locked": { - "lastModified": 1789338294, - "narHash": "sha256-cjgCGUOjDgLVb6bcrWQIJthHL/QxEXlFWurx0T0Ka7o=", + "lastModified": 1789389682, + "narHash": "sha256-n5lAaFSofJDpBrzRks4H9moBNAOAyQ0GMnlYWSQl8uo=", "owner": "noctalia-dev", "repo": "noctalia", - "rev": "9e9e83017a47cbba39fb7b200b9fba7d5213d7f0", + "rev": "2856ec3b1b384f243770240261a11831de51a923", "type": "github" }, "original": { @@ -872,11 +872,11 @@ "nixpkgs": "nixpkgs_13" }, "locked": { - "lastModified": 1789303379, - "narHash": "sha256-nhg21B4QdKaEA/dNExGPDiNfRYv8tQ7hHTGOajMNVH4=", + "lastModified": 1789367673, + "narHash": "sha256-EUAnyaH/qpAaNWrgtARuPK7Lnow2kwnZBwnQDmsIERU=", "owner": "noctalia-dev", "repo": "noctalia-greeter", - "rev": "abdbee2bd7dc6e5a9b68219d2336ef286354abfb", + "rev": "d9fe1d7851464a923020d39efae8a6e3561f0d63", "type": "github" }, "original": { @@ -1219,17 +1219,17 @@ "tailwindcss-animated-src": "tailwindcss-animated-src" }, "locked": { - "lastModified": 1789335724, - "narHash": "sha256-+VjYxt9jYx8SGgHl5IHmny9HIzcOc6jyCVnP9Ck8RbA=", + "lastModified": 1789389423, + "narHash": "sha256-kQZTl70PRaSJ0ZBco0tqOFnsrcLl1XekVrLMG21l48U=", "ref": "refs/heads/master", - "rev": "7d270d5c187594fc981a3ce9ac91b4bfb7812250", - "revCount": 3216, + "rev": "f53890e1e1a53561e21261eceee03f87010bb3a1", + "revCount": 3999, "type": "git", - "url": "https://tangled.org/tangled.org/core" + "url": "https://tangled.org/did:plc:j5hmlfdrwkvtxm7cjmu7j2is" }, "original": { "type": "git", - "url": "https://tangled.org/tangled.org/core" + "url": "https://tangled.org/did:plc:j5hmlfdrwkvtxm7cjmu7j2is" } }, "treefmt-nix": { @@ -1255,11 +1255,11 @@ }, "unstable": { "locked": { - "lastModified": 1789149629, - "narHash": "sha256-H6GwaZzZf+4npqv0tph94w9tZddSjFjmQrVsW0z78uk=", + "lastModified": 1789286504, + "narHash": "sha256-eiEK7cKZORNEvX0GeF3RtNEF/JXhgf2RqSp3230q13E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "eaad089433ca2bb662274377d33df3d0e51ef28b", + "rev": "ef34387ddd751e1ab8857adf4676492d32eb24ec", "type": "github" }, "original": { @@ -1291,11 +1291,11 @@ "nixpkgs": "nixpkgs_17" }, "locked": { - "lastModified": 1789239533, - "narHash": "sha256-x6LDRbyl+trEnwrFth2SAdDf8x4SM7DWcjmR2JUxtAg=", + "lastModified": 1789387191, + "narHash": "sha256-UWMvwIlLV3zF2Mkwus17NfLyBzwBsR/5pHFxrWWGyaA=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "b66d03970382d5185e040110b24ecb7a39df0e80", + "rev": "6a281d7c09c0ed6450c5c948ee9a387390285317", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 67ade3a..503d54f 100644 --- a/flake.nix +++ b/flake.nix @@ -21,7 +21,7 @@ noctalia.url = "github:noctalia-dev/noctalia"; scopebuddy.url = "github:OpenGamingCollective/ScopeBuddy"; sops-nix.url = "github:Mic92/sops-nix"; - tangled.url = "git+https://tangled.org/tangled.org/core"; + tangled.url = "git+https://tangled.org/did:plc:j5hmlfdrwkvtxm7cjmu7j2is"; zen-browser.url = "github:0xc000022070/zen-browser-flake"; niri-legacy = { diff --git a/nixosModules/distributedBuilds.nix b/nixosModules/distributedBuilds.nix index 169de12..40bd1ec 100644 --- a/nixosModules/distributedBuilds.nix +++ b/nixosModules/distributedBuilds.nix @@ -69,6 +69,7 @@ in let remoteHost = remote.config.sidonia.services.distributedBuilds.host; builderName = "${remoteHost.user}_at_${remote.config.networking.hostName}"; + substituterName = "substituter_at_${remote.config.networking.hostName}"; hostName = builtins.head remoteHost.hostNames; in lib.mkIf remoteHost.enable { @@ -79,20 +80,20 @@ in publicKey = remoteHost.ssh.pubKey; }; }; - # extraConfig = '' - # Host ${builderName} - # User ${remoteHost.user} - # Hostname ${hostName} - # IdentitiesOnly yes - # IdentityFile ${client.ssh.privKeyPath} - # ConnectTimeout 3 - # ''; + extraConfig = '' + Host ${substituterName} + User nix-ssh + Hostname ${hostName} + IdentitiesOnly yes + IdentityFile ${client.ssh.privKeyPath} + ConnectTimeout 3 + ''; }; nix = { settings = { trusted-public-keys = [ remoteHost.signing.pubKey ]; substituters = [ - "${remote.config.nix.sshServe.protocol}://nix-ssh@${hostName}" + "${remote.config.nix.sshServe.protocol}://${substituterName}" ]; }; buildMachines = [ -- 2.51.2