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..be76690 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 (pkgs) stdenv lib fetchFromGitHub; }; in { options = { util-nixarr.services.cross-seed = { @@ -52,39 +52,42 @@ in { }; config = mkIf cfg.enable { - systemd.tmpfiles.rules = [ - "d '${cfg.dataDir}' 0700 ${cfg.user} ${cfg.group} - -" - ]; + #systemd.tmpfiles.rules = [ + # "d '${cfg.dataDir}' 0700 ${cfg.user} ${cfg.group} - -" + #]; - systemd.services.cross-seed = { - description = "cross-seed"; - after = ["network.target"]; - wantedBy = ["multi-user.target"]; + #systemd.services.crossSeed = { + # description = "cross-seed"; + # 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 - ExecStartPre = [("+" + pkgs.writeShellScript "transmission-prestart" '' - ${pkgs.jq}/bin/jq --slurp add ${settingsFile} '${cfg.credentialsFile}' | - install -D -m 600 -o '${cfg.user}' /dev/stdin '${cfg.dataDir}/config.json' - '' - )]; - Type = "simple"; - User = cfg.user; - Group = cfg.group; - ExecStart = "${getExe cross-seedPkg} daemon"; - Restart = "on-failure"; - }; - }; + # serviceConfig = { + # # Run as root in case that the cfg.credentialsFile is not readable by cross-seed + # #ExecStartPre = [("+" + pkgs.writeShellScript "transmission-prestart" '' + # # ${pkgs.jq}/bin/jq --slurp add ${settingsFile} '${cfg.credentialsFile}' | + # # install -D -m 600 -o '${cfg.user}' /dev/stdin '${cfg.dataDir}/config.json' + # #'' + # #)]; + # Type = "simple"; + # User = cfg.user; + # Group = cfg.group; + # #ExecStart = "${cross-seedPkg}/bin/cross-seed daemon"; + # ExecStart = "${pkgs.cowsay}/bin/cowsay"; + # Restart = "on-failure"; + # }; + #}; - users.users = mkIf (cfg.user == "cross-seed") { - cross-seed = { - isSystemUser = true; - group = cfg.group; - }; - }; + #users.users = mkIf (cfg.user == "cross-seed") { + # cross-seed = { + # isSystemUser = true; + # group = cfg.group; + # }; + #}; - users.groups = mkIf (cfg.group == "cross-seed") {}; + #users.groups = mkIf (cfg.group == "cross-seed") { + # cross-seed = { }; + #}; }; }