fujin/nixarr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed handling of nixarr.enable option dependency

Browse Source
This commit is contained in:
rasmus-kirk
2025-03-18 15:44:27 +01:00
parent 5da89a70c6
commit 2e7d3a901d
15 changed files with 427 additions and 540 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+4
View File
@@ -5,6 +5,10 @@
Added:
- Plex service
Updated:
- If `nixarr.enable` is not enabled other services will automatically now
be disabled, instead of throwing an assertion error.
## 2025-03-17
Added:
nixarr/bazarr/default.nix
+1 -10
View File
@@ -19,8 +19,6 @@ in {
example = true;
description = ''
Whether or not to enable the Bazarr service.
**Required options:** [`nixarr.enable`](#nixarr.enable)
'';
};
@@ -65,7 +63,7 @@ in {
};
};
config = mkIf cfg.enable {
config = mkIf (nixarr.enable && cfg.enable) {
assertions = [
{
assertion = cfg.vpn.enable -> nixarr.vpn.enable;
@@ -74,13 +72,6 @@ in {
nixarr.vpn.enable option to be set, but it was not.
'';
}
{
assertion = cfg.enable -> nixarr.enable;
message = ''
The nixarr.bazarr.enable option requires the nixarr.enable option
to be set, but it was not.
'';
}
];
util-nixarr.services.bazarr = {
nixarr/ddns/default.nix
+1 -17
View File
@@ -45,7 +45,6 @@ in {
description = ''
**Required options:**
- [`nixarr.enable`](#nixarr.enable)
- [`nixarr.ddns.njalla.keysFile`](#nixarr.ddns.njalla.keysfile)
- [`nixarr.vpn.enable`](#nixarr.vpn.enable)
@@ -75,7 +74,6 @@ in {
description = ''
**Required options:**
- [`nixarr.enable`](#nixarr.enable)
- [`nixarr.ddns.njalla.keysFile`](#nixarr.ddns.njalla.keysfile)
Whether or not to enable DDNS for a [Njalla](https://njal.la/)
@@ -111,7 +109,7 @@ in {
};
};
config = mkIf cfg.njalla.enable {
config = mkIf (nixarr.enable && cfg.enable) {
assertions = [
{
assertion = cfg.njalla.enable -> cfg.njalla.keysFile != null;
@@ -120,20 +118,6 @@ in {
nixarr.ddns.njalla.keysFile option to be set, but it was not.
'';
}
{
assertion = cfg.njalla.enable -> nixarr.enable;
message = ''
The nixarr.ddns.njalla.enable option requires the nixarr.enable
option to be set, but it was not.
'';
}
{
assertion = cfg.njalla.vpn.enable -> nixarr.enable;
message = ''
The nixarr.ddns.njalla.vpn.enable option requires the nixarr.enable
option to be set, but it was not.
'';
}
{
assertion = cfg.njalla.vpn.enable -> cfg.njalla.vpn.keysFile != null;
message = ''
nixarr/jellyfin/default.nix
+5 -16
View File
@@ -3,12 +3,12 @@
lib,
pkgs,
...
}: let
}:
with lib; let
cfg = config.nixarr.jellyfin;
defaultPort = 8096;
nixarr = config.nixarr;
in
with lib; {
in {
options.nixarr.jellyfin = {
enable = mkOption {
type = types.bool;
@@ -16,8 +16,6 @@ in
example = true;
description = ''
Whether or not to enable the Jellyfin service.
**Required options:** [`nixarr.enable`](#nixarr.enable)
'';
};
@@ -104,9 +102,7 @@ in
};
};
config =
mkIf cfg.enable
{
config = mkIf (nixarr.enable && cfg.enable) {
assertions = [
{
assertion = cfg.vpn.enable -> nixarr.vpn.enable;
@@ -115,13 +111,6 @@ in
nixarr.vpn.enable option to be set, but it was not.
'';
}
{
assertion = cfg.enable -> nixarr.enable;
message = ''
The nixarr.jellyfin.enable option requires the nixarr.enable
option to be set, but it was not.
'';
}
{
assertion = !(cfg.vpn.enable && cfg.expose.https.enable);
message = ''
@@ -246,4 +235,4 @@ in
];
};
};
}
}
nixarr/jellyseerr/default.nix
+1 -10
View File
@@ -20,8 +20,6 @@ in {
example = true;
description = ''
Whether or not to enable the Jellyseerr service.
**Required options:** [`nixarr.enable`](#nixarr.enable)
'';
};
@@ -73,15 +71,8 @@ in {
};
};
config = mkIf cfg.enable {
config = mkIf (nixarr.enable && cfg.enable) {
assertions = [
{
assertion = cfg.enable -> nixarr.enable;
message = ''
The nixarr.jellyseerr.enable option requires the
nixarr.enable option to be set, but it was not.
'';
}
{
assertion = cfg.vpn.enable -> nixarr.vpn.enable;
message = ''
nixarr/lidarr/default.nix
+1 -10
View File
@@ -16,8 +16,6 @@ in {
example = true;
description = ''
Whether or not to enable the Lidarr service.
**Required options:** [`nixarr.enable`](#nixarr.enable)
'';
};
@@ -62,15 +60,8 @@ in {
};
};
config = mkIf cfg.enable {
config = mkIf (nixarr.enable && cfg.enable) {
assertions = [
{
assertion = cfg.enable -> nixarr.enable;
message = ''
The nixarr.lidarr.enable option requires the nixarr.enable option
to be set, but it was not.
'';
}
{
assertion = cfg.vpn.enable -> nixarr.vpn.enable;
message = ''
nixarr/openssh/default.nix
+1 -9
View File
@@ -14,7 +14,6 @@ in {
description = ''
**Required options:**
- [`nixarr.vpn.enable`](#nixarr.vpn.enable)
- [`nixarr.enable`](#nixarr.enable)
Run the openssh service through a vpn, exposing it to the internet.
@@ -44,15 +43,8 @@ in {
'';
};
config = mkIf cfg.expose.vpn.enable {
config = mkIf (cfg.expose.vpn.enable && cfg.enable) {
assertions = [
{
assertion = cfg.expose.vpn.enable -> nixarr.enable;
message = ''
The nixarr.openssh.expose.vpn.enable option requires the
nixarr.enable option to be set, but it was not.
'';
}
{
assertion = cfg.expose.vpn.enable -> nixarr.vpn.enable;
message = ''
nixarr/plex/default.nix
+5 -16
View File
@@ -3,12 +3,12 @@
lib,
pkgs,
...
}: let
}:
with lib; let
cfg = config.nixarr.plex;
defaultPort = 32400;
nixarr = config.nixarr;
in
with lib; {
in {
options.nixarr.plex = {
enable = mkOption {
type = types.bool;
@@ -16,8 +16,6 @@ in
example = true;
description = ''
Whether or not to enable the Plex service.
**Required options:** [`nixarr.enable`](#nixarr.enable)
'';
};
@@ -104,9 +102,7 @@ in
};
};
config =
mkIf cfg.enable
{
config = mkIf (nixarr.enable && cfg.enable) {
assertions = [
{
assertion = cfg.vpn.enable -> nixarr.vpn.enable;
@@ -115,13 +111,6 @@ in
nixarr.vpn.enable option to be set, but it was not.
'';
}
{
assertion = cfg.enable -> nixarr.enable;
message = ''
The nixarr.plex.enable option requires the nixarr.enable
option to be set, but it was not.
'';
}
{
assertion = !(cfg.vpn.enable && cfg.expose.https.enable);
message = ''
@@ -243,4 +232,4 @@ in
];
};
};
}
}
nixarr/prowlarr/default.nix
+1 -10
View File
@@ -20,8 +20,6 @@ in {
example = true;
description = ''
Whether or not to enable the Prowlarr service.
**Required options:** [`nixarr.enable`](#nixarr.enable)
'';
};
@@ -66,15 +64,8 @@ in {
};
};
config = mkIf cfg.enable {
config = mkIf (nixarr.enable && cfg.enable) {
assertions = [
{
assertion = cfg.enable -> nixarr.enable;
message = ''
The nixarr.prowlarr.enable option requires the
nixarr.enable option to be set, but it was not.
'';
}
{
assertion = cfg.vpn.enable -> nixarr.vpn.enable;
message = ''
nixarr/radarr/default.nix
+1 -10
View File
@@ -16,8 +16,6 @@ in {
example = true;
description = ''
Whether or not to enable the Radarr service.
**Required options:** [`nixarr.enable`](#nixarr.enable)
'';
};
@@ -62,15 +60,8 @@ in {
};
};
config = mkIf cfg.enable {
config = mkIf (nixarr.enable && cfg.enable) {
assertions = [
{
assertion = cfg.enable -> nixarr.enable;
message = ''
The nixarr.radarr.enable option requires the
nixarr.enable option to be set, but it was not.
'';
}
{
assertion = cfg.vpn.enable -> nixarr.vpn.enable;
message = ''
nixarr/readarr/default.nix
+1 -10
View File
@@ -16,8 +16,6 @@ in {
example = true;
description = ''
Whether or not to enable the Readarr service.
**Required options:** [`nixarr.enable`](#nixarr.enable)
'';
};
@@ -62,15 +60,8 @@ in {
};
};
config = mkIf cfg.enable {
config = mkIf (nixarr.enable && cfg.enable) {
assertions = [
{
assertion = cfg.enable -> nixarr.enable;
message = ''
The nixarr.readarr.enable option requires the
nixarr.enable option to be set, but it was not.
'';
}
{
assertion = cfg.vpn.enable -> nixarr.vpn.enable;
message = ''
nixarr/recyclarr/default.nix
+1 -10
View File
@@ -59,8 +59,6 @@ in {
example = true;
description = ''
Whether or not to enable the Recyclarr service. This service does not need to be run behind a VPN.
**Required options:** [`nixarr.enable`](#nixarr.enable)
'';
};
@@ -164,15 +162,8 @@ in {
};
};
config = mkIf cfg.enable {
config = mkIf (nixarr.enable && cfg.enable) {
assertions = [
{
assertion = cfg.enable -> nixarr.enable;
message = ''
The nixarr.recyclarr.enable option requires the nixarr.enable
option to be set, but it was not.
'';
}
{
assertion = cfg.enable -> (nixarr.radarr.enable || nixarr.sonarr.enable);
message = ''
nixarr/sabnzbd/default.nix
+11 -1
View File
@@ -173,7 +173,17 @@ in {
sab_config_map.write()
'';
in
mkIf cfg.enable {
mkIf (nixarr.enable && cfg.enable) {
assertions = [
{
assertion = cfg.vpn.enable -> nixarr.vpn.enable;
message = ''
The nixarr.readarr.vpn.enable option requires the
nixarr.vpn.enable option to be set, but it was not.
'';
}
];
users = {
groups.usenet = {};
users.usenet = {
nixarr/sonarr/default.nix
+1 -10
View File
@@ -16,8 +16,6 @@ in {
example = true;
description = ''
Whether or not to enable the Sonarr service.
**Required options:** [`nixarr.enable`](#nixarr.enable)
'';
};
@@ -62,15 +60,8 @@ in {
};
};
config = mkIf cfg.enable {
config = mkIf (nixarr.enable && cfg.enable) {
assertions = [
{
assertion = cfg.enable -> nixarr.enable;
message = ''
The nixarr.sonarr.enable option requires the
nixarr.enable option to be set, but it was not.
'';
}
{
assertion = cfg.vpn.enable -> nixarr.vpn.enable;
message = ''
nixarr/transmission/default.nix
+1 -10
View File
@@ -71,8 +71,6 @@ in {
example = true;
description = ''
Whether or not to enable the Transmission service.
**Required options:** [`nixarr.enable`](#nixarr.enable)
'';
};
@@ -267,7 +265,7 @@ in {
./cross-seed
];
config = mkIf cfg.enable {
config = mkIf (nixarr.enable && cfg.enable) {
assertions = [
{
assertion = cfg.vpn.enable -> nixarr.vpn.enable;
@@ -276,13 +274,6 @@ in {
nixarr.vpn.enable option to be set, but it was not.
'';
}
{
assertion = cfg.enable -> nixarr.enable;
message = ''
The nixarr.transmission.enable option requires the nixarr.enable
option to be set, but it was not.
'';
}
{
assertion = cfg-cross-seed.enable -> nixarr.prowlarr.enable;
message = ''