From c4d4164915a6f580e929a8afa41556a6c23f1ddf Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Thu, 15 Aug 2024 22:01:24 +0000 Subject: [PATCH] Fix flood auto dl --- environments/server/default.nix | 2 +- environments/server/guesspath.sh | 3 ++- environments/server/smartrss.sh | 2 +- flake.lock | 6 +++--- hosts/kadan/hardware-configuration.nix | 1 + modules/cli/default.nix | 2 ++ 6 files changed, 10 insertions(+), 6 deletions(-) diff --git a/environments/server/default.nix b/environments/server/default.nix index cbe707d..1a1ac08 100644 --- a/environments/server/default.nix +++ b/environments/server/default.nix @@ -52,7 +52,7 @@ in { services.fail2ban = { enable = true; - bantime = "-1"; + bantime = "5w"; ignoreIP = [ "192.168.0.0/16" ]; diff --git a/environments/server/guesspath.sh b/environments/server/guesspath.sh index 0e8c9e5..e8ac3c3 100644 --- a/environments/server/guesspath.sh +++ b/environments/server/guesspath.sh @@ -4,7 +4,8 @@ set -e OUT=/mnt/kyoo/shows -if [[ -z "$TR_TORRENT_LABELS" ]]; then +if [[ ! -z "$TR_TORRENT_LABELS" ]]; then + echo "Ignoring $TR_TORRENT_NAME since it has labels $TR_TORRENT_LABELS" exit fi echo "Running with $TR_TORRENT_NAME $TR_TORRENT_ID" diff --git a/environments/server/smartrss.sh b/environments/server/smartrss.sh index 285a8e3..180000c 100755 --- a/environments/server/smartrss.sh +++ b/environments/server/smartrss.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -e -name=$(guessit "$1" -P "title" | tr -d "[:punct:]") +name=$(guessit "$1" -P title | tr -d "[:punct:]") ls /mnt/kyoo/shows/ | tr -d "[:punct:]" | grep -qix "$name" diff --git a/flake.lock b/flake.lock index ceeee75..a1ba360 100644 --- a/flake.lock +++ b/flake.lock @@ -201,11 +201,11 @@ "flood": { "flake": false, "locked": { - "lastModified": 1723307247, - "narHash": "sha256-y26eEJ1qj9ru6tucsS4+5fvrHF+YuCzBhHKrVVgRaHY=", + "lastModified": 1723758821, + "narHash": "sha256-0j6BAla7uh2atcq3F9KbRnU7cDcPpRDelmrt4MqSubg=", "owner": "zoriya", "repo": "flood", - "rev": "9339748675d301ede32f9faf58792ae3433a75ed", + "rev": "b256916973cbdb2ff6f3e61345f360fc6472bfc1", "type": "github" }, "original": { diff --git a/hosts/kadan/hardware-configuration.nix b/hosts/kadan/hardware-configuration.nix index b588597..ba59cfe 100644 --- a/hosts/kadan/hardware-configuration.nix +++ b/hosts/kadan/hardware-configuration.nix @@ -110,6 +110,7 @@ # Load nvidia driver for Xorg and Wayland services.xserver.videoDrivers = ["nvidia"]; + # see: https://github.com/NixOS/nixpkgs/issues/322400 virtualisation.docker.enableNvidia = true; # hardware.nvidia-container-toolkit.enable = true; diff --git a/modules/cli/default.nix b/modules/cli/default.nix index ef96c29..5646ecc 100644 --- a/modules/cli/default.nix +++ b/modules/cli/default.nix @@ -22,6 +22,8 @@ }; # Using arch's google api key. Waiting for https://github.com/NixOS/nixpkgs/issues/321121 to be fixed. services.geoclue2.geoProviderUrl = "https://www.googleapis.com/geolocation/v1/geolocate?key=AIzaSyDwr302FpOSkGRpLlUpPThNTDPbXcIn_FM"; + # needed for geoclue, see https://github.com/NixOS/nixpkgs/issues/329522 + services.avahi.enable = true; services.automatic-timezoned.enable = true; programs.dconf.enable = true;