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

Plex/JF fix

Browse Source
This commit is contained in:
rasmus-kirk
2025-03-18 22:25:56 +01:00
parent eae2381419
commit b6a6206cea
3 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+1 -1
View File
@@ -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
nixarr/jellyfin/default.nix
+14 -5
View File
@@ -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
nixarr/plex/default.nix
+10 -1
View File
@@ -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 = ''