diff --git a/flake.lock b/flake.lock index 6144234..fe760a5 100644 --- a/flake.lock +++ b/flake.lock @@ -26,11 +26,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1742254251, - "narHash": "sha256-3wGCx5UR86pgurSYB//LsBMKAsw6qpiOpnzgShPQKkM=", + "lastModified": 1742098205, + "narHash": "sha256-gCkVTohFTyq/Pi3dlUhv1uA5Kqbalf45nLmUDRluULE=", "owner": "catppuccin", "repo": "nix", - "rev": "4cb9c621072312fb45c6e86b57e5fabd97f1b95d", + "rev": "d84df59c7aa29cebaff9f190d19c24e7ddacd773", "type": "github" }, "original": { @@ -122,11 +122,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1742309519, - "narHash": "sha256-b70YYjI6IHpXKGj5lOVAzHbHG85srWxF4rY/X+JBJ+w=", + "lastModified": 1742113225, + "narHash": "sha256-tUor57FbLwwy+duUbjq8Ff0TyayK1i50rUbXBfdgfuM=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "3c75f0f339d9e23c5c71ea26d67eb0ed2d5b498d", + "rev": "7e13aa507d714371e6ff70a91d76dcb339311773", "type": "github" }, "original": { @@ -282,11 +282,11 @@ ] }, "locked": { - "lastModified": 1742300892, - "narHash": "sha256-QmF0proyjXI9YyZO9GZmc7/uEu5KVwCtcdLsKSoxPAI=", + "lastModified": 1742058297, + "narHash": "sha256-b4SZc6TkKw8WQQssbN5O2DaCEzmFfvSTPYHlx/SFW9Y=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "ea26a82dda75bee6783baca6894040c8e6599728", + "rev": "59f17850021620cd348ad2e9c0c64f4e6325ce2a", "type": "github" }, "original": { @@ -387,11 +387,11 @@ ] }, "locked": { - "lastModified": 1742305478, - "narHash": "sha256-iYCinzZnnUeCkZ031qGRwPdwRsqW6o9Y0MgGpA7Zva4=", + "lastModified": 1741955947, + "narHash": "sha256-2lbURKclgKqBNm7hVRtWh0A7NrdsibD0EaWhahUVhhY=", "owner": "nix-community", "repo": "home-manager", - "rev": "fb74bb76d94a6c55632376c931fc108131260ee9", + "rev": "4e12151c9e014e2449e0beca2c0e9534b96a26b4", "type": "github" }, "original": { @@ -464,11 +464,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1742301745, - "narHash": "sha256-CffAQ3Dz3ZbFtbzmgdW7Z6vtVd2VOhpVJQ36xdBTDoU=", + "lastModified": 1742087036, + "narHash": "sha256-oiVgpmK9bZe7lvf7JRc7jAW4fotEuW9d/3e9LJMk8mU=", "ref": "refs/heads/main", - "rev": "a5e237635079a57d2e377313eb9c3aaddc2c2d4d", - "revCount": 17684, + "rev": "29732f19a2a9e0d9e7a5bad953c4fad6f719c50e", + "revCount": 17654, "type": "git", "url": "https://git@git.lix.systems/lix-project/lix" }, @@ -569,11 +569,11 @@ }, "nixosHardware": { "locked": { - "lastModified": 1742217307, - "narHash": "sha256-3fwpN7KN226ghLlpO9TR0/WpgQOmOj1e8bieUxpIYSk=", + "lastModified": 1741792691, + "narHash": "sha256-f0BVt1/cvA0DQ/q3rB+HY4g4tKksd03ZkzI4xehC2Ew=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "4f4d97d7b7be387286cc9c988760a7ebaa5be1f1", + "rev": "e1f12151258b12c567f456d8248e4694e9390613", "type": "github" }, "original": { @@ -647,11 +647,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1742268799, - "narHash": "sha256-IhnK4LhkBlf14/F8THvUy3xi/TxSQkp9hikfDZRD4Ic=", + "lastModified": 1741862977, + "narHash": "sha256-prZ0M8vE/ghRGGZcflvxCu40ObKaB+ikn74/xQoNrGQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "da044451c6a70518db5b730fe277b70f494188f1", + "rev": "cdd2ef009676ac92b715ff26630164bb88fec4e0", "type": "github" }, "original": { @@ -695,11 +695,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1742069588, - "narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=", + "lastModified": 1741851582, + "narHash": "sha256-cPfs8qMccim2RBgtKGF+x9IBCduRvd/N5F4nYpU0TVE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5", + "rev": "6607cf789e541e7873d40d3a8f7815ea92204f32", "type": "github" }, "original": { @@ -992,11 +992,11 @@ ] }, "locked": { - "lastModified": 1742303424, - "narHash": "sha256-2R7cGdcA2npQQcIWu2cTlU63veTzwVZe78BliIuJT00=", + "lastModified": 1739829690, + "narHash": "sha256-mL1szCeIsjh6Khn3nH2cYtwO5YXG6gBiTw1A30iGeDU=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "b3b938ab8ba2e8a0ce9ee9b30ccfa5e903ae5753", + "rev": "3d0579f5cc93436052d94b73925b48973a104204", "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" ]; + }; +}