diff --git a/flake.lock b/flake.lock index df91ec8..8ed084a 100644 --- a/flake.lock +++ b/flake.lock @@ -324,24 +324,6 @@ "type": "github" } }, - "flake-utils_2": { - "inputs": { - "systems": "systems_4" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "fonts": { "flake": false, "locked": { @@ -747,17 +729,16 @@ }, "lidarr-mb-gap": { "inputs": { - "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1762882489, - "narHash": "sha256-YFk5GkD7TkIMbcnJzFz+IRN4vH7QJSRphpS3zje3PRU=", + "lastModified": 1762901399, + "narHash": "sha256-idaZ4k8oynnXUWTLXKPwqbLHdaPmLH1FfjsRWXUM97I=", "ref": "refs/heads/main", - "rev": "35e6c7e330868b00e7c8dbc878db776ba01f719d", - "revCount": 11, + "rev": "0b86143646f57aa52fab5182352ca0200e824571", + "revCount": 18, "type": "git", "url": "https://git.lebubu.org/vibe-coded/lidarr-mb-gap.git" }, @@ -1097,7 +1078,7 @@ "nixpkgs" ], "nur": "nur_2", - "systems": "systems_5", + "systems": "systems_4", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -1195,21 +1176,6 @@ "type": "github" } }, - "systems_5": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tinted-foot": { "flake": false, "locked": { diff --git a/hosts/server/configuration.nix b/hosts/server/configuration.nix index 6c28dcc..0fb6602 100644 --- a/hosts/server/configuration.nix +++ b/hosts/server/configuration.nix @@ -45,12 +45,14 @@ lidarr-mb-gap = lib.mkIf config.my.secureHost { sopsFile = ../../secrets/env.yaml; }; - "private_keys/lidarr-mb-gap" = lib.mkIf (config.my.secureHost && config.services.lidarr-mb-gap.enable) { - sopsFile = ../../secrets/keys.yaml; - owner = config.users.users.lidarr-mb-gap.name; - inherit (config.users.users.lidarr-mb-gap) group; - path = "${config.users.users.lidarr-mb-gap.home}/.ssh/ed25519_lidarr-mb-gap"; - }; + "private_keys/lidarr-mb-gap" = + lib.mkIf (config.my.secureHost && config.services.lidarr-mb-gap.enable) + { + sopsFile = ../../secrets/keys.yaml; + owner = config.users.users.lidarr-mb-gap.name; + inherit (config.users.users.lidarr-mb-gap) group; + path = "${config.users.users.lidarr-mb-gap.home}/.ssh/ed25519_lidarr-mb-gap"; + }; }; networking = { hostName = "server"; @@ -88,10 +90,11 @@ lidarr-mb-gap = { enable = true; package = inputs.lidarr-mb-gap.packages.${pkgs.system}.lidarr-mb-gap; - reportDir = "/var/lib/lidarr-mb-gap/reports"; + home = "/var/lib/lidarr-mb-gap"; envFile = config.sops.secrets.lidarr-mb-gap.path; runInterval = "weekly"; - syncToVPS = false; + syncToVPS = true; + vpsPort = 3456; vpsHost = "lidarr-reports@${config.my.ips.vps}"; vpsPath = "/var/www/html/lidarr-mb-gap"; sshKeyFile = config.sops.secrets."private_keys/lidarr-mb-gap".path; diff --git a/secrets/env.yaml b/secrets/env.yaml index a796f70..131252b 100644 --- a/secrets/env.yaml +++ b/secrets/env.yaml @@ -10,7 +10,7 @@ dns: ENC[AES256_GCM,data:fQN3SOm0HzOjSjTohRAD4KlXdEu5PbQc3DvK3rLC1S4G0G4HUPkgucN cloudflare-api: ENC[AES256_GCM,data:iNUMlY8rz5yHVitpK4HGaFSK7j+c8Pm7rOQMOQGmSJ3a8ASyrtouPgLbcnoPY/jalsJYAj991dSiui+Vwqs=,iv:qWONG/KLd9/F4tqrWF5T25Zxst3bk+kOYaOFBFSBAAY=,tag:gRFxar8KS8gnX8oaCD156Q==,type:str] synapse: ENC[AES256_GCM,data:IR0pFwQBEM4O8mzzYXrPe2FjulSUGuitzLDLms2uovr6gEU82mCkRO/UCQOybNm03iOQeXX0Whz739kpYSGSInEyx69BNG/etH+bMu+GbYeMdrTEyXHSa7kcH4Ug,iv:Vn2ILYXnCj+Op/E2kWoxV+2ZtlxYJxO6XK3Ql41KW6w=,tag:9wogJFLlmfM5PRgPdwFlcw==,type:str] readeck: ENC[AES256_GCM,data:TsIkHLji37dDHQRt78SquBhoSREHDgvgbc6+M1k2MLrgMGJ/Ejfy5AZXCIp/Qj5sXDzKP4j6Y6xFvGLswCqe02XjqGCpX13gZVCFPuKr8Nq051Xg,iv:Rc/pjYP+Vd/DvLCYsfJjDrnAlAiUlZOcNeeYzE6O3UY=,tag:OvR+CXMmrUFbsrHvduhnjA==,type:str] -lidarr-mb-gap: ENC[AES256_GCM,data:zMr1UJUxqu3BJ2YRZKeIUzcEQRsHM6xeZ9kJ7ElynTD7ay0je+L0i+pyWe3OGwVN/8UUIQnKf42Pr6C4hJSxqwetjG6jQYTUGwTWzvxr/TDr6uhZwG59wLh8e02ymLw0GMJYfkQdZqEWyicHESHNdPmBFx3kByU01/QvOQlFO82/FPTvwpY=,iv:sk57rOrV/lj5f47sF4agZYPScLRiMgtM7iwzmubnZ2Q=,tag:LNl8TK3MswXj6lqBNA9Vqw==,type:str] +lidarr-mb-gap: ENC[AES256_GCM,data:bNzD9Nf9BWAPkm0Yk0J4MJbmo908QX9VsD+40Rngnfec9nzH4vZ2DrelxRllgT1kgnXMQzvoSgNhBwkDN4fgX73hz1FjkytTwahlO0wcY6R+tw4aokh0QYy0TVx5pZ4u1FEQOAp3IMgBsP8HOqaL/NEsEo3yb0K9iC3AfFihkLDJmVh26Pg=,iv:go0qS7/BcfcAMPkAdGWCoL61gNqBG5lWDev++y9DJ/I=,tag:LgtEyTZH8NfhfrKTcAigZw==,type:str] sops: age: - recipient: age1lufn6t35gs4wgevyr2gud4eec7lvkn7pgnnv4tja64ww3hef7gqq8fas37 @@ -49,7 +49,7 @@ sops: QXRUYWtGcWZCVW11U3VYRktuUjlCbDgKsTK4WhUza/JuoDTU3uATa6fq/8eYzxtb 9BUK1ddzx9Mghea9XBMS17YGtGmW800OsLBomb3SINnOFvejcnKf8Q== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-11-11T17:47:23Z" - mac: ENC[AES256_GCM,data:9wWhkUbU/bNV6erUpQhwza47XLbdC7RIfw1J+bFdKW1DLjokeYr1HacZVw+O3bGDFZqKs9JomfnYLxeZay0VXKLb/e61yETi2lx3/BV3Ghp3Tsglf3Eoy4QokvErqDi3GoT7Hvc2bArq4hlYuZI5yjUU+8xvwMopU9MS1C1Muuw=,iv:WfnngiGiY8pnvZHiGueCkZtnGbF42L7ut+tCs8BMskA=,tag:x81EkcXBIk1bylD/QqXzPg==,type:str] + lastmodified: "2025-11-11T23:18:34Z" + mac: ENC[AES256_GCM,data:i3U364pjZB5Y61Wf7ETbXhNWyfH1gw0oyPcNyT+nCIJmePh8JWiP9hnHmZfLS1BKkI2powQdezbz9R0XDvU7g2SkV8EsWmn/h3rFwbopUZbeRQ2SCoX7LGFez74l1oTPQjL8zWJVdrUtfAFgbZKSEWuz7rsDieKBVhIJwWaeePY=,iv:N4z+X3eD6jH+zQfY24qec+U6wkfhLGPm4MzY8T2Km/A=,tag:yluW5YSKMZ4Kk+wcXbkj8Q==,type:str] unencrypted_suffix: _unencrypted version: 3.11.0