diff --git a/flake.lock b/flake.lock index 173eb52..8ee84ca 100644 --- a/flake.lock +++ b/flake.lock @@ -492,11 +492,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1760357808, - "narHash": "sha256-jyrorNErOtMiIMs82qqhAjUxet15llyJKVnCawqLE+M=", + "lastModified": 1760787273, + "narHash": "sha256-yIM3sTR6KN+ZmzX0bxYw/4PKZTbPliDTZO9yJXaqOzA=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "4b55ec6830602c36fddcfbe40188a7fdc58a975e", + "rev": "6607c6440d4e3e7313e421f6258b52e6b7982170", "type": "github" }, "original": { @@ -706,11 +706,11 @@ ] }, "locked": { - "lastModified": 1760234031, - "narHash": "sha256-++3Sl4X0kEz/+7P0nOer6FUH0EX0AzuPL9FgNloM2Xk=", + "lastModified": 1760579393, + "narHash": "sha256-YuXbuaJ/2EZ1FePhz1eTyo/b+kpiEmw4lj6wX0u0Q/0=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "019169d0c5e13ffc5d2024ab75f46d5980d5f6bc", + "rev": "7d002241668a738df3973a6c07ef5d79e5508b24", "type": "github" }, "original": { @@ -821,11 +821,11 @@ }, "nixpkgs-small": { "locked": { - "lastModified": 1760309387, - "narHash": "sha256-e0lvQ7+B1Y8zjykYHAj9tBv10ggLqK0nmxwvMU3J0Eo=", + "lastModified": 1760725957, + "narHash": "sha256-tdoIhL/NlER290HfSjOkgi4jfmjeqmqrzgnmiMtGepE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6cd95994a9c8f7c6f8c1f1161be94119afdcb305", + "rev": "81b927b14b7b3988334d5282ef9cba802e193fe1", "type": "github" }, "original": { @@ -837,11 +837,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1760038930, - "narHash": "sha256-Oncbh0UmHjSlxO7ErQDM3KM0A5/Znfofj2BSzlHLeVw=", + "lastModified": 1760524057, + "narHash": "sha256-EVAqOteLBFmd7pKkb0+FIUyzTF61VKi7YmvP1tw4nEw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0b4defa2584313f3b781240b29d61f6f9f7e0df3", + "rev": "544961dfcce86422ba200ed9a0b00dd4b1486ec5", "type": "github" }, "original": { @@ -853,11 +853,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1760139962, - "narHash": "sha256-4xggC56Rub3WInz5eD7EZWXuLXpNvJiUPahGtMkwtuc=", + "lastModified": 1760580664, + "narHash": "sha256-/YdfibIrnqXAL8p5kqCU345mzpHoOtuVIkMiI2pF4Dc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7e297ddff44a3cc93673bb38d0374df8d0ad73e4", + "rev": "98ff3f9af2684f6136c24beef08f5e2033fc5389", "type": "github" }, "original": { @@ -896,11 +896,11 @@ ] }, "locked": { - "lastModified": 1760366745, - "narHash": "sha256-dIw+Gft7Lw1dEmHJjJE9DEQramPE0RW5OPJHySPjO2g=", + "lastModified": 1760801222, + "narHash": "sha256-VuSNfZGf6N5tbxeaP8kcjaLODiV/MgYQvGHwY5e1kYE=", "owner": "nix-community", "repo": "nur", - "rev": "a5310c6c8817a0e0fe399eeba37024119b27e961", + "rev": "9103bddc908e08987752a99450078658f8c39cac", "type": "github" }, "original": { @@ -1003,11 +1003,11 @@ ] }, "locked": { - "lastModified": 1760240450, - "narHash": "sha256-sa9bS9jSyc4vH0jSWrUsPGdqtMvDwmkLg971ntWOo2U=", + "lastModified": 1760393368, + "narHash": "sha256-8mN3kqyqa2PKY0wwZ2UmMEYMcxvNTwLaOrrDsw6Qi4E=", "owner": "Mic92", "repo": "sops-nix", - "rev": "41fd1f7570c89f645ee0ada0be4e2d3c4b169549", + "rev": "ab8d56e85b8be14cff9d93735951e30c3e86a437", "type": "github" }, "original": { @@ -1037,11 +1037,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1760352574, - "narHash": "sha256-Wtp6XEiVDVmxGSYafyM6gdZVyOoqg7NMQd07RkpFFWM=", + "lastModified": 1760478648, + "narHash": "sha256-Y4l+Y3zUvqIDbyLrtOrzNvp1o50Fp9TYK+iwtwweFU4=", "owner": "danth", "repo": "stylix", - "rev": "ca10aa9c6703b088bdac02d8352fd91d5496e4ed", + "rev": "1ec254101285777db13922303cc47ded06e10bb3", "type": "github" }, "original": { diff --git a/modules/network/firewall.nix b/modules/network/firewall.nix index be2fbd3..3493374 100644 --- a/modules/network/firewall.nix +++ b/modules/network/firewall.nix @@ -6,6 +6,7 @@ }: let firewallBlacklist = [ + "sabnzbd" "lidarr" "maloja" "tranga" diff --git a/modules/servers/nextcloud.nix b/modules/servers/nextcloud.nix index 8a97373..ea389e2 100644 --- a/modules/servers/nextcloud.nix +++ b/modules/servers/nextcloud.nix @@ -29,7 +29,7 @@ let }; } ); - pytensorflow = pkgs.python311.withPackages (ps: [ ps.tensorflow ]); + pytensorflow = pkgs.python3.withPackages (ps: [ ps.tensorflow ]); cfg = config.my.servers.nextcloud; cfgC = config.my.servers.collabora; in diff --git a/modules/servers/qbittorrent.nix b/modules/servers/qbittorrent.nix index b0ee1de..f5d64ff 100644 --- a/modules/servers/qbittorrent.nix +++ b/modules/servers/qbittorrent.nix @@ -36,6 +36,10 @@ let ; } ); + torrentCompletionScript = pkgs.writeShellScript "qbit-torrent-completion" '' + chown jawz:piracy -R "$1" + chmod -R 775 "$1" + ''; in { options.my.servers = { @@ -50,6 +54,7 @@ in }; }; config = lib.mkIf (config.my.servers.qbittorrent.enable && config.my.secureHost) { + my.network.firewall.additionalPorts = [ config.my.servers.qbittorrent.port ]; home-manager.users.jawz.xdg.dataFile.vuetorrent.source = vuetorrent; sops.secrets = let @@ -72,7 +77,10 @@ in "unpackerr/radarr-api" = mkUnpackerrSecret; }; systemd = { - packages = [ pkgs.qbittorrent-nox ]; + packages = [ + pkgs.qbittorrent-nox + torrentCompletionScript + ]; services."qbittorrent-nox@jawz" = { enable = true; overrideStrategy = "asDropin"; diff --git a/modules/servers/sabnzbd.nix b/modules/servers/sabnzbd.nix index c33fd0e..f96b772 100644 --- a/modules/servers/sabnzbd.nix +++ b/modules/servers/sabnzbd.nix @@ -12,6 +12,7 @@ in }; }; config = lib.mkIf cfg.enable { + my.network.firewall.additionalPorts = [ cfg.port ]; services.sabnzbd = { inherit (cfg) enable; group = "piracy";