From 850f62c3dbaedd6b5359ef2a3e14c2a944376264 Mon Sep 17 00:00:00 2001 From: Jet Date: Wed, 18 Mar 2026 17:59:52 -0700 Subject: [PATCH] update: nfu and reconfigure cache for noisebell --- flake.lock | 149 ++++++++---------------------------------- modules/noisebell.nix | 6 +- 2 files changed, 32 insertions(+), 123 deletions(-) diff --git a/flake.lock b/flake.lock index 091fb60..c03a782 100644 --- a/flake.lock +++ b/flake.lock @@ -73,26 +73,11 @@ }, "crane": { "locked": { - "lastModified": 1773189535, - "narHash": "sha256-E1G/Or6MWeP+L6mpQ0iTFLpzSzlpGrITfU2220Gq47g=", + "lastModified": 1773857772, + "narHash": "sha256-5xsK26KRHf0WytBtsBnQYC/lTWDhQuT57HJ7SzuqZcM=", "owner": "ipetkov", "repo": "crane", - "rev": "6fa2fb4cf4a89ba49fc9dd5a3eb6cde99d388269", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, - "crane_2": { - "locked": { - "lastModified": 1773115265, - "narHash": "sha256-5fDkKTYEgue2klksd52WvcXfZdY1EIlbk0QggAwpFog=", - "owner": "ipetkov", - "repo": "crane", - "rev": "27711550d109bf6236478dc9f53b9e29c1a374c5", + "rev": "b556d7bbae5ff86e378451511873dfd07e4504cd", "type": "github" }, "original": { @@ -176,11 +161,11 @@ ] }, "locked": { - "lastModified": 1773506317, - "narHash": "sha256-qWKbLUJpavIpvOdX1fhHYm0WGerytFHRoh9lVck6Bh0=", + "lastModified": 1773889306, + "narHash": "sha256-PAqwnsBSI9SVC2QugvQ3xeYCB0otOwCacB1ueQj2tgw=", "owner": "nix-community", "repo": "disko", - "rev": "878ec37d6a8f52c6c801d0e2a2ad554c75b9353c", + "rev": "5ad85c82cc52264f4beddc934ba57f3789f28347", "type": "github" }, "original": { @@ -295,11 +280,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1773734432, - "narHash": "sha256-IF5ppUWh6gHGHYDbtVUyhwy/i7D261P7fWD1bPefOsw=", + "lastModified": 1773821835, + "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cda48547b432e8d3b18b4180ba07473762ec8558", + "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0", "type": "github" }, "original": { @@ -310,22 +295,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1773646010, - "narHash": "sha256-iYrs97hS7p5u4lQzuNWzuALGIOdkPXvjz7bviiBjUu8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "5b2c2d84341b2afb5647081c1386a80d7a8d8605", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1744536153, "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", @@ -344,18 +313,18 @@ "noisebell": { "inputs": { "agenix": "agenix_2", + "crane": "crane", "nixpkgs": [ "nixpkgs" ], - "pi-service": "pi-service", - "remote": "remote" + "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1773746123, - "narHash": "sha256-S2SnL1iUJ2nWmizHuGe9yleDtRBW0md7/LAKQ2BTKII=", + "lastModified": 1773881560, + "narHash": "sha256-iABdsqA9bX1VV6IxWySdEXfOzH6oqSAqeU5IJA6T1yg=", "ref": "refs/heads/main", - "rev": "e225ffe9972ef17beca7914811c03853eca3b603", - "revCount": 37, + "rev": "553d7d1780a7635a81f0fcc80e3a4c0e5301e679", + "revCount": 40, "type": "git", "url": "https://git.extremist.software/jet/noisebell" }, @@ -371,11 +340,11 @@ ] }, "locked": { - "lastModified": 1773877610, - "narHash": "sha256-95MYG1YSdry/YUbUeaMlfAhYE9j4WxNjO4iRJuFo4T0=", + "lastModified": 1773883275, + "narHash": "sha256-cvZAMMf7zJW9nPe7zza7BiFKQ3y3ztTZc/9n3ozOLUc=", "ref": "refs/heads/main", - "rev": "acca19d3dd8249fe8648de22f3f0263fadf1db8a", - "revCount": 1, + "rev": "800f19d47131af85744c189e850361b6b918df68", + "revCount": 3, "type": "git", "url": "https://git.extremist.software/jet/noisepics" }, @@ -384,45 +353,6 @@ "url": "https://git.extremist.software/jet/noisepics" } }, - "pi-service": { - "inputs": { - "crane": "crane", - "nixpkgs": "nixpkgs_2", - "rust-overlay": "rust-overlay_2" - }, - "locked": { - "path": "./pi/pi-service", - "type": "path" - }, - "original": { - "path": "./pi/pi-service", - "type": "path" - }, - "parent": [ - "noisebell" - ] - }, - "remote": { - "inputs": { - "crane": "crane_2", - "nixpkgs": [ - "noisebell", - "nixpkgs" - ], - "rust-overlay": "rust-overlay_3" - }, - "locked": { - "path": "./remote", - "type": "path" - }, - "original": { - "path": "./remote", - "type": "path" - }, - "parent": [ - "noisebell" - ] - }, "root": { "inputs": { "agenix": "agenix", @@ -459,16 +389,15 @@ "inputs": { "nixpkgs": [ "noisebell", - "pi-service", "nixpkgs" ] }, "locked": { - "lastModified": 1773716879, - "narHash": "sha256-vXCTasEzzTTd0ZGEuyle20H2hjRom66JeNr7i2ktHD0=", + "lastModified": 1773803479, + "narHash": "sha256-GD6i1F2vrSxbsmbS92+8+x3DbHOJ+yrS78Pm4xigW4M=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "1a9ddeb45c5751b800331363703641b84d1f41f0", + "rev": "f17186f52e82ec5cf40920b58eac63b78692ac7c", "type": "github" }, "original": { @@ -479,29 +408,7 @@ }, "rust-overlay_3": { "inputs": { - "nixpkgs": [ - "noisebell", - "remote", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1773115373, - "narHash": "sha256-bfK9FJFcQth6f3ydYggS5m0z2NRGF/PY6Y2XgZDJ6pg=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "1924b4672a2b8e4aee6e6652ec2e59a8d3c5648e", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_4": { - "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1773803479, @@ -584,14 +491,14 @@ "nixpkgs": [ "nixpkgs" ], - "rust-overlay": "rust-overlay_4" + "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1773879485, - "narHash": "sha256-3W/bVsP9YNPdexbgNnx0i9tI41ibKsDZPySrAYD+e8Q=", + "lastModified": 1774078882, + "narHash": "sha256-0ABtMFWqKsESSX2E4Z+uY1VXCNb9PzZ/ke7HmpTkflE=", "ref": "refs/heads/main", - "rev": "51bbf67bbeb2b5c4fdfd12661796fb517cf30e34", - "revCount": 34, + "rev": "ede986080a538eced16490e47c638398c2e4c49f", + "revCount": 39, "type": "git", "url": "https://git.extremist.software/jet/website" }, diff --git a/modules/noisebell.nix b/modules/noisebell.nix index 5e08454..1c2f7c1 100644 --- a/modules/noisebell.nix +++ b/modules/noisebell.nix @@ -28,7 +28,7 @@ services.noisebell-cache = { enable = true; - port = 3003; + port = 3005; domain = "noisebell.extremist.software"; piAddress = "http://noisebell:80"; piApiKeyFile = config.age.secrets.noisebell-cache-to-pi-key.path; @@ -45,11 +45,13 @@ discordTokenFile = config.age.secrets.noisebell-discord-token.path; channelId = "1034916379486322718"; webhookSecretFile = config.age.secrets.noisebell-discord-webhook-secret.path; + cacheUrl = "http://localhost:3005"; + imageBaseUrl = "https://${config.services.noisebell-cache.domain}/image"; }; services.noisebell-rss = { enable = true; domain = "rss.noisebell.extremist.software"; - cacheUrl = "http://localhost:3003"; + cacheUrl = "http://localhost:3005"; }; }