diff --git a/nixarr/prowlarr/default.nix b/nixarr/prowlarr/default.nix index 7d9bd70..bf7716b 100644 --- a/nixarr/prowlarr/default.nix +++ b/nixarr/prowlarr/default.nix @@ -48,8 +48,6 @@ in { "d '${cfg.stateDir}' 0700 prowlarr root - -" ]; - users.groups.prowlarr = {}; - util-nixarr.services.prowlarr = { enable = true; dataDir = cfg.stateDir; diff --git a/nixarr/prowlarr/prowlarr-module/default.nix b/nixarr/prowlarr/prowlarr-module/default.nix index 7655ff4..48c919f 100644 --- a/nixarr/prowlarr/prowlarr-module/default.nix +++ b/nixarr/prowlarr/prowlarr-module/default.nix @@ -70,6 +70,8 @@ in { }; }; - users.groups = mkIf (cfg.group == "prowlarr") {}; + users.groups = mkIf (cfg.group == "prowlarr") { + prowlarr = { }; + }; }; } diff --git a/nixarr/transmission/cross-seed/default.nix b/nixarr/transmission/cross-seed/default.nix index b5278e0..8aa0305 100644 --- a/nixarr/transmission/cross-seed/default.nix +++ b/nixarr/transmission/cross-seed/default.nix @@ -6,9 +6,9 @@ }: with lib; let cfg = config.util-nixarr.services.cross-seed; - settingsFormat = pkgs.formats.json {}; - settingsFile = settingsFormat.generate "settings.json" cfg.settings; - cross-seedPkg = import ../../../pkgs/cross-seed { inherit (pkgs) stdenv lib fetchFromGitHub; }; + #settingsFormat = pkgs.formats.json {}; + #settingsFile = settingsFormat.generate "settings.json" cfg.settings; + cross-seedPkg = import ../../../pkgs/cross-seed { inherit config pkgs lib; }; in { options = { util-nixarr.services.cross-seed = { @@ -61,7 +61,7 @@ in { after = ["network.target"]; wantedBy = ["multi-user.target"]; - environment.CONFIG_DIR = cfg.dataDir; + #environment.CONFIG_DIR = cfg.dataDir; serviceConfig = { # Run as root in case that the cfg.credentialsFile is not readable by cross-seed @@ -73,7 +73,8 @@ in { Type = "simple"; User = cfg.user; Group = cfg.group; - ExecStart = "${getExe cross-seedPkg} daemon"; + ExecStart = "${cross-seedPkg}/bin/cross-seed daemon"; + #ExecStart = "${pkgs.cowsay}/bin/cowsay"; Restart = "on-failure"; }; }; @@ -85,6 +86,8 @@ in { }; }; - users.groups = mkIf (cfg.group == "cross-seed") {}; + users.groups = mkIf (cfg.group == "cross-seed") { + cross-seed = { }; + }; }; } diff --git a/nixarr/transmission/default.nix b/nixarr/transmission/default.nix index 367bba9..62ab203 100644 --- a/nixarr/transmission/default.nix +++ b/nixarr/transmission/default.nix @@ -9,7 +9,7 @@ with lib; let nixarr = config.nixarr; cfg-cross-seed = config.nixarr.transmission.privateTrackers.cross-seed; transmissionCrossSeedScript = with builtins; pkgs.writeShellApplication { - name = "mk-cross-seed-credentials"; + name = "transmission-cross-seed-script"; runtimeInputs = with pkgs; [ curl ]; @@ -223,11 +223,11 @@ in { } // cfg-cross-seed.extraSettings; }; # Run as root in case that the cfg.credentialsFile is not readable by cross-seed - systemd.services.cross-seed.serviceConfig = mkIf cfg-cross-seed.enable { - ExecStartPre = [(mkBefore - ("+" + (getExe mkCrossSeedCredentials)) - )]; - }; + #systemd.services.cross-seed.serviceConfig = mkIf cfg-cross-seed.enable { + # ExecStartPre = [(mkBefore + # ("+" + (getExe mkCrossSeedCredentials)) + # )]; + #}; services.transmission = { enable = true; @@ -269,8 +269,10 @@ in { anti-brute-force-enabled = true; anti-brute-force-threshold = 10; - script-torrent-done-enabled = cfg-cross-seed.enable; - script-torrent-done-filename = if cfg-cross-seed.enable then transmissionCrossSeedScript else null; + #script-torrent-done-enabled = cfg-cross-seed.enable; + #script-torrent-done-filename = if cfg-cross-seed.enable then + # "${transmissionCrossSeedScript}/bin/transmission-cross-seed-script" + #else null; message-level = if cfg.messageLevel == "none"