diff --git a/CHANGELOG.md b/CHANGELOG.md index 2625aa3..77a2c6e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ Added: - Plex service -- Expose and sandboxing to Jellyseerr module +- Sandboxed Jellyseerr module and added expose option Updated: - If `nixarr.enable` is not enabled other services will automatically now diff --git a/nixarr/jellyfin/default.nix b/nixarr/jellyfin/default.nix index e5fe466..a39b8a6 100644 --- a/nixarr/jellyfin/default.nix +++ b/nixarr/jellyfin/default.nix @@ -16,6 +16,8 @@ in { example = true; description = '' Whether or not to enable the Jellyfin service. + + **Conflicting options:** [`nixarr.plex.enable`](#nixarr.plex.enable) ''; }; @@ -104,6 +106,13 @@ in { config = mkIf (nixarr.enable && cfg.enable) { assertions = [ + { + assertion = cfg.enable -> !nixarr.plex.enable; + message = '' + The nixarr.jellyfin.vpn.enable option requires the nixarr.plex.enable + option to NOT be set, but it was. + ''; + } { assertion = cfg.vpn.enable -> nixarr.vpn.enable; message = '' @@ -147,11 +156,11 @@ in { "d '${cfg.stateDir}' 0700 streamer root - -" # Media Dirs - "d '${nixarr.mediaDir}/library' 0775 streamer media - -" - "d '${nixarr.mediaDir}/library/shows' 0775 streamer media - -" - "d '${nixarr.mediaDir}/library/movies' 0775 streamer media - -" - "d '${nixarr.mediaDir}/library/music' 0775 streamer media - -" - "d '${nixarr.mediaDir}/library/books' 0775 streamer media - -" + "d '${nixarr.mediaDir}/library' 0775 streamer media - -" + "d '${nixarr.mediaDir}/library/shows' 0775 streamer media - -" + "d '${nixarr.mediaDir}/library/movies' 0775 streamer media - -" + "d '${nixarr.mediaDir}/library/music' 0775 streamer media - -" + "d '${nixarr.mediaDir}/library/books' 0775 streamer media - -" ]; # Always prioritise Jellyfin IO diff --git a/nixarr/plex/default.nix b/nixarr/plex/default.nix index 2d7372f..5d5867f 100644 --- a/nixarr/plex/default.nix +++ b/nixarr/plex/default.nix @@ -16,10 +16,12 @@ in { example = true; description = '' Whether or not to enable the Plex service. + + **Conflicting options:** [`nixarr.jellyfin.enable`](#nixarr.jellyfin.enable) ''; }; - package = mkPackageOption pkgs "plexmediaserver" {}; + package = mkPackageOption pkgs "plex" {}; stateDir = mkOption { type = types.path; @@ -104,6 +106,13 @@ in { config = mkIf (nixarr.enable && cfg.enable) { assertions = [ + { + assertion = cfg.enable -> !nixarr.jellyfin.enable; + message = '' + The nixarr.plex.vpn.enable option requires the nixarr.jellyfin.enable + option to NOT be set, but it was. + ''; + } { assertion = cfg.vpn.enable -> nixarr.vpn.enable; message = ''