diff --git a/nixos/modules/services/misc/recyclarr.nix b/nixos/modules/services/misc/recyclarr.nix
index 4570e5fc9f3a..8ee6f3d53546 100644
--- a/nixos/modules/services/misc/recyclarr.nix
+++ b/nixos/modules/services/misc/recyclarr.nix
@@ -10,7 +10,7 @@ let
cfg = config.services.recyclarr;
format = pkgs.formats.yaml { };
stateDir = "/var/lib/recyclarr";
- configPath = "${stateDir}/config.json";
+ configPath = "${stateDir}/config.yml";
secretsReplacement = utils.genJqSecretsReplacement {
loadCredential = true;
} cfg.configuration configPath;
@@ -25,24 +25,24 @@ in
type = format.type;
default = { };
example = {
- sonarr = [
- {
+ sonarr = {
+ sonarr-main = {
instance_name = "main";
base_url = "http://localhost:8989";
api_key = {
_secret = "/run/credentials/recyclarr.service/sonarr-api_key";
};
- }
- ];
- radarr = [
- {
+ };
+ };
+ radarr = {
+ radarr-main = {
instance_name = "main";
base_url = "http://localhost:7878";
api_key = {
_secret = "/run/credentials/recyclarr.service/radarr-api_key";
};
- }
- ];
+ };
+ };
};
description = ''
Recyclarr YAML configuration as a Nix attribute set.
@@ -98,7 +98,6 @@ in
systemd.services.recyclarr = {
description = "Recyclarr Service";
- # YAML is a JSON super-set
preStart = secretsReplacement.script;
serviceConfig = {
@@ -106,7 +105,11 @@ in
User = cfg.user;
Group = cfg.group;
StateDirectory = "recyclarr";
- ExecStart = "${lib.getExe cfg.package} ${cfg.command} --app-data ${stateDir} --config ${configPath}";
+ Environment = [
+ "RECYCLARR_CONFIG_DIR=${stateDir}"
+ "RECYCLARR_DATA_DIR=${stateDir}"
+ ];
+ ExecStart = "${lib.getExe cfg.package} ${cfg.command} --config ${configPath}";
LoadCredential = secretsReplacement.credentials;
ProtectSystem = "strict";
@@ -151,4 +154,6 @@ in
};
};
};
+
+ meta.maintainers = [ lib.maintainers.josephst ];
}
diff --git a/pkgs/by-name/re/recyclarr/001-Git-Version.patch b/pkgs/by-name/re/recyclarr/001-Git-Version.patch
deleted file mode 100644
index 2d43e0124a52..000000000000
--- a/pkgs/by-name/re/recyclarr/001-Git-Version.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/Directory.Build.props b/Directory.Build.props
-index af8e3b12..07dd1898 100644
---- a/Directory.Build.props
-+++ b/Directory.Build.props
-@@ -9,7 +9,7 @@
- $(MSBuildThisFileDirectory)
- $(RepositoryRoot)tests\
- $(RepositoryRoot)
--
-+ true
-
-
-