Add Declutarr package, update module (#154)

* Add Declutarr package

* Update Declutarr module using new package

Author: ethnt

modules/nixos/services/declutarr/default.nix

@@ -1,26 +1,111 @@
-{ config, lib, ... }:
+{ config, lib, pkgs, ... }:
 
 with lib;
 
-let cfg = config.services.declutarr;
+let
+  cfg = config.services.declutarr;
+  format = pkgs.formats.yaml { };
+  configFile = if cfg.config != null then
+    format.generate "configuration.yaml" cfg.config
+  else
+    cfg.configFile;
 in {
   options.services.declutarr = {
     enable = mkEnableOption "Enable Declutarr";
 
-    configFile = mkOption { type = types.path; };
+    package = mkOption {
+      type = types.package;
+      default = pkgs.declutarr;
+    };
+
+    dataDir = mkOption {
+      type = types.path;
+      default = "/var/lib/declutarr";
+    };
+
+    user = mkOption {
+      type = types.str;
+      default = "declutarr";
+    };
 
-    extraVolumes = mkOption {
-      type = types.listOf types.path;
-      default = [ ];
+    group = mkOption {
+      type = types.str;
+      default = "declutarr";
+    };
+
+    config = mkOption {
+      type = types.nullOr format.type;
+      default = null;
+    };
+
+    configFile = mkOption {
+      type = types.nullOr types.path;
+      default = null;
+    };
+
+    environmentFile = mkOption {
+      type = types.nullOr types.path;
+      default = null;
     };
   };
 
   config = mkIf cfg.enable {
-    virtualisation.oci-containers.containers.declutarr = {
-      image = "ghcr.io/manimatter/decluttarr:dev";
-      environment = { TZ = config.time.timeZone; };
-      volumes = [ "${cfg.configFile}:/app/config/config.yaml" ]
-        ++ (map (vol: "${vol}:${vol}") cfg.extraVolumes);
+    assertions = [{
+      assertion = !(cfg.config != null && cfg.configFile != null);
+      message =
+        "Only one of `config` or `configFile` can be configured at the same time";
+    }];
+
+    systemd.tmpfiles.settings."10-declutarr" = {
+      ${cfg.dataDir} = {
+        "d" = {
+          inherit (cfg) user group;
+          mode = "0777";
+        };
+      };
+
+      "${cfg.dataDir}/config" = {
+        "d" = {
+          inherit (cfg) user group;
+          mode = "0777";
+        };
+      };
+
+      "${cfg.dataDir}/logs" = {
+        "d" = {
+          inherit (cfg) user group;
+          mode = "0777";
+        };
+      };
+    };
+
+    users = {
+      users.declutarr = mkIf (cfg.user == "declutarr") {
+        inherit (cfg) group;
+        isSystemUser = true;
+      };
+
+      groups = mkIf (cfg.group == "declutarr") { declutarr = { }; };
+    };
+
+    systemd.services.declutarr = {
+      enable = true;
+      wants = [ "network.online.target" ];
+      after = [ "network.online.target" ];
+      wantedBy = [ "multi-user.target" ];
+      preStart = ''
+        ln -sf ${configFile} ${cfg.dataDir}/config/config.yaml
+      '';
+      serviceConfig = {
+        WorkingDirectory = cfg.dataDir;
+        EnvironmentFile = [ cfg.environmentFile ];
+        ExecStart = lib.getExe cfg.package;
+        ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+        User = cfg.user;
+        Group = cfg.group;
+        Restart = "on-failure";
+        ReadWritePaths = [ cfg.dataDir ];
+      };
     };
   };
 }

modules/overlays/default.nix

@@ -20,7 +20,8 @@
       # This is to pick up bugfix here: https://github.com/thanos-io/thanos/issues/7923
       inherit (nixpkgs-master) thanos;
 
-      inherit (self'.packages) bentopdf fileflows mongodb-ce-6_0 tracearr;
+      inherit (self'.packages)
+        bentopdf declutarr fileflows mongodb-ce-6_0 tracearr;
     };
   };
 }

modules/packages/declutarr/default.nix

@@ -0,0 +1,52 @@
+{ python3Packages, fetchFromGitHub, makeWrapper }:
+
+python3Packages.buildPythonApplication rec {
+  name = "declutarr";
+  version = "2.0.0";
+
+  src = fetchFromGitHub {
+    owner = "ManiMatter";
+    repo = "decluttarr";
+    tag = "v${version}";
+    hash = "sha256-3mB5+ao3w+CkyTS/o1O9/7UXOoGkA/mTpJNEQxUTa9Q=";
+  };
+
+  pyproject = true;
+
+  build-system = with python3Packages; [ setuptools ];
+
+  dependencies = with python3Packages; [
+    requests
+    python-dateutil
+    pytest
+    pytest-asyncio
+    black
+    pylint
+    autoflake
+    isort
+    pyyaml-env-tag
+    demjson3
+    ruff
+    watchdog
+  ];
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin $out/libexec/declutarr
+    cp -R main.py src tests $out/libexec/declutarr
+
+    makeWrapper "${python3Packages.python.interpreter}" "$out/bin/declutarr" \
+      --set PYTHONPATH "$PYTHONPATH" \
+      --add-flags "$out/libexec/declutarr/main.py"
+
+    runHook postInstall
+  '';
+
+  # TODO: Actually run tests
+  doCheck = false;
+
+  meta.mainProgram = "declutarr";
+}

modules/packages/default.nix

@@ -2,6 +2,7 @@ _: {
   perSystem = { pkgs, ... }: {
     packages = {
       bentopdf = pkgs.callPackage ./bentopdf { };
+      declutarr = pkgs.callPackage ./declutarr { };
       fileflows = pkgs.callPackage ./fileflows { };
       mongodb-ce-6_0 = pkgs.callPackage ./mongodb-ce-6_0 { };
       tracearr = pkgs.callPackage ./tracearr { };

modules/profiles/media-management/declutarr/default.nix

@@ -51,13 +51,13 @@
         }];
       };
     };
+    owner = config.services.declutarr.user;
+    inherit (config.services.declutarr) group;
     mode = "0700";
   };
 
   services.declutarr = {
     enable = true;
     configFile = config.sops.templates.declutarr_config.path;
-    extraVolumes =
-      [ "/mnt/blockbuster/media/movies" "/mnt/blockbuster/media/tv" ];
   };
 }

modules/profiles/media-management/radarr/default.nix

@@ -37,7 +37,6 @@
       owner = config.services.radarr.user;
       inherit (config.services.radarr) group;
       mode = "0660";
-      restartUnits = [ "radarr.service" ];
     };
   };
 

modules/profiles/media-management/sonarr/default.nix

@@ -39,7 +39,6 @@
       owner = config.services.sonarr.user;
       inherit (config.services.sonarr) group;
       mode = "0660";
-      restartUnits = [ "sonarr.service" ];
     };
   };