diff --git a/services/qbittorrent.nix b/services/qbittorrent.nix index 15d78af..1b23100 100644 --- a/services/qbittorrent.nix +++ b/services/qbittorrent.nix @@ -11,7 +11,7 @@ (lib.serviceMountDeps "qbittorrent" [ service_configs.torrents_path config.services.qbittorrent.serverConfig.Preferences.Downloads.TempPath - "/var/lib/qBittorrent/qBittorrent" + "${config.services.qbittorrent.profileDir}/qBittorrent" ]) ]; @@ -34,8 +34,8 @@ services.qbittorrent = { enable = true; - package = pkgs.qbittorrent-nox; webuiPort = service_configs.ports.torrent; + profileDir = "/var/lib/qBittorrent"; serverConfig.LegalNotice.Accepted = true; @@ -44,8 +44,8 @@ AlternativeUIEnabled = true; RootFolder = builtins.toString ( pkgs.fetchzip { - url = "https://github.com/VueTorrent/VueTorrent/releases/download/v2.26.0/vuetorrent.zip"; - sha256 = "EFVzsr/OZ/QMJ+NN3kDkmIk6FCCnqgK6DgsLWNonspU="; + url = "https://github.com/VueTorrent/VueTorrent/releases/download/v2.28.2/vuetorrent.zip"; + sha256 = "8aKmiXcr2pp8qt4w/lYBAIjLPh8tlgYsx6PbovY54KM="; } ); @@ -55,8 +55,7 @@ }; Downloads = { - SavePath = service_configs.torrent.SavePath; - TempPath = service_configs.torrent.TempPath; + inherit (service_configs.torrent) SavePath TempPath; }; }; @@ -67,7 +66,7 @@ IgnoreLimitsOnLAN = true; - IncludeOverheadInLimits = true; + IncludeOverheadInLimits = false; GlobalMaxRatio = 6.0; QueueingSystemEnabled = false; # seed all torrents all the time @@ -201,7 +200,7 @@ AnnounceToAllTrackers = true; # idk why it also has to be specified here too? - TempPath = config.services.qbittorrent.serverConfig.Preferences.Downloads.TempPath; + inherit (config.services.qbittorrent.serverConfig.Preferences.Downloads) TempPath; TempPathEnabled = true; # how many connections per sec @@ -217,6 +216,7 @@ systemd.tmpfiles.rules = [ "d ${config.services.qbittorrent.serverConfig.Preferences.Downloads.SavePath} 0750 ${config.services.qbittorrent.user} ${service_configs.media_group}" "d ${config.services.qbittorrent.serverConfig.Preferences.Downloads.TempPath} 0750 ${config.services.qbittorrent.user} ${service_configs.media_group}" + "d ${config.services.qbittorrent.profileDir} 0700 ${config.services.qbittorrent.user} ${config.services.qbittorrent.group}" ]; # make qbittorrent use a vpn