refactor: jellyfin module > all in one mediaServer Module

system/modules/services/default.nix

@@ -2,16 +2,12 @@
 
 {
   imports = [ 
-  ./jellyfin
+  ./mediaServer
-  ./deluge
   ];
 
   options.systemModules.services = {
-    jellyfin = {
+    mediaServer = {
-      enable = lib.mkEnableOption "Enable jellyfin service module";
+      enable = lib.mkEnableOption "Enable mediaserver service module";
-    };
-    deluge = {
-      enable = lib.mkEnableOption "Enable deluge service module";
     };
   };
   

system/modules/services/deluge/default.nix

@@ -1,22 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  cfg = config.systemModules.services.deluge;
-in
-
-{
-  config = lib.mkIf cfg.enable {
-    services.deluge = {
-      user = "deluge";
-      group = "deluge";
-      enable = true;
-      web.enable = true;
-    };
-
-    # fileSystems."/media/Downloads" = {
-    #   device = "/dev/disk/by-label/torrents";
-    #   fsType = "ext4";
-    #   options = [ "rw" "uid=1000" "gid=991" "umask=002" ];
-    # };
-  };
-}

system/modules/services/jellyfin/default.nix

@@ -1,32 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  cfg = config.systemModules.services.jellyfin;
-in
-
-{
-  config = lib.mkIf cfg.enable {
-    environment.systemPackages = with pkgs; [
-      jellyfin
-      jellyfin-web
-      jellyfin-ffmpeg 
-    ];
-    services.jellyfin = {
-      user = "jellyfin";
-      group = "media";
-      enable = true;
-      openFirewall = true;
-    };
-    users.users.jellyfin = {
-      isSystemUser = true;
-      group = "media";
-    };
-    users.groups.media = {};
-
-    # fileSystems."/media" = {
-    #   device = "/dev/disk/by-label/ooksmedia";
-    #   fsType = "ntfs";
-    #   options = [ "rw" "uid=1000" "gid=991" "umask=002" ];
-    # };
-  };
-}

system/modules/services/mediaServer/default.nix

@@ -0,0 +1,49 @@
+{ config, lib, pkgs, ... }:
+
+let
+  cfg = config.systemModules.services.mediaServer;
+in
+
+{
+  config = lib.mkIf cfg.enable {
+
+    users.groups.media = { };
+
+    environment.systemPackages = with pkgs; [
+      jellyfin
+      jellyfin-web
+      jellyfin-ffmpeg 
+    ];
+
+    services = {
+      jellyfin = {
+        group = "media";
+        enable = true;
+        openFirewall = true;
+      };
+      deluge = {
+        group = "media";
+        enable = true;
+        web.enable = true;
+      };
+      radarr = {
+        group = "media";
+        enable = true;
+      };
+      sonarr = {
+        group = "media";
+        enable = true;
+      };
+      prowlarr.enable = true;
+    };
+
+    systemd.tmpfiles.rules = [
+      "d /jellyfin 0770 - media - -"
+    ];
+
+    fileSystems."/jellyfin" = {
+      device = "/dev/disk/by-label/jellyfin";
+      fsType = "btrfs";
+    };
+  };
+}

system/profiles/mediaServer/default.nix

@@ -10,8 +10,7 @@ in
   config = lib.mkIf cfg.enable {
     systemModules = {
       services = {
-        jellyfin.enable = true;
+        mediaServer.enable = true;
-        deluge.enable = true;
       };
     };
   };