diff --git a/flake.lock b/flake.lock index de705f8..b3a803e 100644 --- a/flake.lock +++ b/flake.lock @@ -156,11 +156,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1742203058, - "narHash": "sha256-YMy01dURXhxyjx2W+Dv83b2RRnNq28K4t4+kvrRxFto=", + "lastModified": 1736759802, + "narHash": "sha256-XCaIRTC+YlL5nRi9WJHeftyfw2Z0YXwwzEmHThGuR3Q=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "7a9a25389a6ad9402f9aa5087ccb36f8383045a8", + "rev": "244a2ab1459c72bac32a2db088549f8bc6d7a836", "type": "github" }, "original": { @@ -783,11 +783,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1742136038, - "narHash": "sha256-DDe16FJk18sadknQKKG/9FbwEro7A57tg9vB5kxZ8kY=", + "lastModified": 1736549401, + "narHash": "sha256-ibkQrMHxF/7TqAYcQE+tOnIsSEzXmMegzyBWza6uHKM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a1185f4064c18a5db37c5c84e5638c78b46e3341", + "rev": "1dab772dd4a68a7bba5d9460685547ff8e17d899", "type": "github" }, "original": { @@ -847,11 +847,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1742069588, - "narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=", + "lastModified": 1736523798, + "narHash": "sha256-Xb8mke6UCYjge9kPR9o4P1nVrhk7QBbKv3xQ9cj7h2s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5", + "rev": "130595eba61081acde9001f43de3248d8888ac4a", "type": "github" }, "original": { diff --git a/hosts/sisko/default.nix b/hosts/sisko/default.nix index 15e267a..9b9df03 100644 --- a/hosts/sisko/default.nix +++ b/hosts/sisko/default.nix @@ -30,7 +30,7 @@ "atticd" "jellyfin" "matrix" - "arr" + "radarr" "zerotier" "mosh" ] diff --git a/modules/arr/default.nix b/modules/arr/default.nix deleted file mode 100644 index 465eed8..0000000 --- a/modules/arr/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ pkgs, lib, ... }: -{ - services.radarr = { - enable = true; - }; - - services.sonarr = { - enable = true; - package = - (builtins.getFlake "github:NixOS/nixpkgs/c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5") - .legacyPackages.${pkgs.stdenv.system}.sonarr; - }; - - services.prowlarr = { - enable = true; - }; - - systemd.services.prowlarr = { - serviceConfig = { - DynamicUser = lib.mkForce false; - }; - }; - - users.users.radarr.extraGroups = [ "transmission" ]; - users.users.sonarr.extraGroups = [ "transmission" ]; - - environment.persistence."/persist".directories = [ - "/var/lib/radarr" - "/var/lib/prowlarr" - "/var/lib/sonarr" - ]; - - services.nginx.virtualHosts = { - "radarr.sisko.wg.aciceri.dev" = { - forceSSL = true; - useACMEHost = "aciceri.dev"; - locations."/" = { - proxyPass = "http://localhost:7878"; # FIXME hardcoded port - }; - serverAliases = [ "radarr.sisko.zt.aciceri.dev" ]; - }; - "prowlarr.sisko.wg.aciceri.dev" = { - forceSSL = true; - useACMEHost = "aciceri.dev"; - locations."/" = { - proxyPass = "http://localhost:9696"; # FIXME hardcoded port - }; - serverAliases = [ "prowlarr.sisko.zt.aciceri.dev" ]; - }; - "sonarr.sisko.wg.aciceri.dev" = { - forceSSL = true; - useACMEHost = "aciceri.dev"; - locations."/" = { - proxyPass = "http://localhost:8989"; # FIXME hardcoded port - }; - serverAliases = [ "sonarr.sisko.zt.aciceri.dev" ]; - }; - }; -} diff --git a/modules/radarr/default.nix b/modules/radarr/default.nix new file mode 100644 index 0000000..77ee804 --- /dev/null +++ b/modules/radarr/default.nix @@ -0,0 +1,14 @@ +{ + services.radarr = { + enable = true; + }; + + services.nginx.virtualHosts."radarr.sisko.wg.aciceri.dev" = { + forceSSL = true; + useACMEHost = "aciceri.dev"; + locations."/" = { + proxyPass = "http://localhost:7878"; # FIXME hardcoded port + }; + serverAliases = [ "radarr.sisko.zt.aciceri.dev" ]; + }; +}