diff --git a/flake.lock b/flake.lock index c03a782..5a03973 100644 --- a/flake.lock +++ b/flake.lock @@ -71,6 +71,22 @@ "type": "github" } }, + "argononed": { + "flake": false, + "locked": { + "lastModified": 1729566243, + "narHash": "sha256-DPNI0Dpk5aym3Baf5UbEe5GENDrSmmXVdriRSWE+rgk=", + "owner": "nvmd", + "repo": "argononed", + "rev": "16dbee54d49b66d5654d228d1061246b440ef7cf", + "type": "github" + }, + "original": { + "owner": "nvmd", + "repo": "argononed", + "type": "github" + } + }, "crane": { "locked": { "lastModified": 1773857772, @@ -174,6 +190,21 @@ "type": "github" } }, + "flake-compat": { + "locked": { + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems_4" @@ -278,6 +309,75 @@ "url": "https://git.extremist.software/jet/mymx" } }, + "nixos-hardware": { + "locked": { + "lastModified": 1774018263, + "narHash": "sha256-HHYEwK1A22aSaxv2ibhMMkKvrDGKGlA/qObG4smrSqc=", + "owner": "NixOS", + "repo": "nixos-hardware", + "rev": "2d4b4717b2534fad5c715968c1cece04a172b365", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "master", + "repo": "nixos-hardware", + "type": "github" + } + }, + "nixos-images": { + "inputs": { + "nixos-stable": [ + "noisebell", + "nixos-raspberrypi", + "nixpkgs" + ], + "nixos-unstable": [ + "noisebell", + "nixos-raspberrypi", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1747747741, + "narHash": "sha256-LUOH27unNWbGTvZFitHonraNx0JF/55h30r9WxqrznM=", + "owner": "nvmd", + "repo": "nixos-images", + "rev": "cbbd6db325775096680b65e2a32fb6187c09bbb4", + "type": "github" + }, + "original": { + "owner": "nvmd", + "ref": "sdimage-installer", + "repo": "nixos-images", + "type": "github" + } + }, + "nixos-raspberrypi": { + "inputs": { + "argononed": "argononed", + "flake-compat": "flake-compat", + "nixos-images": "nixos-images", + "nixpkgs": [ + "noisebell", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1773704510, + "narHash": "sha256-Kq0WPitNekYzouyd8ROlZb63cpSg/+Ep2XxkV0YlABU=", + "owner": "nvmd", + "repo": "nixos-raspberrypi", + "rev": "b5c77d506bed55250a4642ce6c8b395dd29ef06b", + "type": "github" + }, + "original": { + "owner": "nvmd", + "ref": "main", + "repo": "nixos-raspberrypi", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1773821835, @@ -314,17 +414,19 @@ "inputs": { "agenix": "agenix_2", "crane": "crane", + "nixos-hardware": "nixos-hardware", + "nixos-raspberrypi": "nixos-raspberrypi", "nixpkgs": [ "nixpkgs" ], "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1773881560, - "narHash": "sha256-iABdsqA9bX1VV6IxWySdEXfOzH6oqSAqeU5IJA6T1yg=", + "lastModified": 1774247047, + "narHash": "sha256-rJdb+kEN5Gu2KU2k+sRjPoaE8iyUKpoYOQcl2nT2s/g=", "ref": "refs/heads/main", - "rev": "553d7d1780a7635a81f0fcc80e3a4c0e5301e679", - "revCount": 40, + "rev": "16ad3c61813ede8308921ac37fce15c761979794", + "revCount": 45, "type": "git", "url": "https://git.extremist.software/jet/noisebell" }, @@ -393,11 +495,11 @@ ] }, "locked": { - "lastModified": 1773803479, - "narHash": "sha256-GD6i1F2vrSxbsmbS92+8+x3DbHOJ+yrS78Pm4xigW4M=", + "lastModified": 1774149071, + "narHash": "sha256-SYp8NyzwfCO3Guqmu9hPRHR1hwESlQia5nNz3lYo2qA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "f17186f52e82ec5cf40920b58eac63b78692ac7c", + "rev": "6a031966eab3bfaa19be9e261eed5b8a79c04b18", "type": "github" }, "original": { diff --git a/modules/noisebell.nix b/modules/noisebell.nix index 1c2f7c1..8f09ba6 100644 --- a/modules/noisebell.nix +++ b/modules/noisebell.nix @@ -1,57 +1,17 @@ -{ config, inputs, ... }: +{ ... }: { - users.groups.noisebell = {}; - users.users.noisebell-cache.extraGroups = [ "noisebell" ]; - users.users.noisebell-discord.extraGroups = [ "noisebell" ]; - - age.secrets.noisebell-pi-to-cache-key = { - file = "${inputs.noisebell}/secrets/pi-to-cache-key.age"; - group = "noisebell"; - mode = "0440"; - }; - age.secrets.noisebell-cache-to-pi-key = { - file = "${inputs.noisebell}/secrets/cache-to-pi-key.age"; - group = "noisebell"; - mode = "0440"; - }; - age.secrets.noisebell-discord-token = { - file = "${inputs.noisebell}/secrets/discord-token.age"; - group = "noisebell"; - mode = "0440"; - }; - age.secrets.noisebell-discord-webhook-secret = { - file = "${inputs.noisebell}/secrets/discord-webhook-secret.age"; - group = "noisebell"; - mode = "0440"; - }; - services.noisebell-cache = { enable = true; port = 3005; domain = "noisebell.extremist.software"; - piAddress = "http://noisebell:80"; - piApiKeyFile = config.age.secrets.noisebell-cache-to-pi-key.path; - inboundApiKeyFile = config.age.secrets.noisebell-pi-to-cache-key.path; - outboundWebhooks = [ - { url = "https://discord.noisebell.extremist.software/webhook"; secretFile = config.age.secrets.noisebell-discord-webhook-secret.path; } - ]; + piAddress = "http://noisebell-pi"; }; services.noisebell-discord = { enable = true; port = 3004; domain = "discord.noisebell.extremist.software"; - 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:3005"; }; }