From dd0a5d0ec63f0e2ae5ca134402ab37b1639fb4ca Mon Sep 17 00:00:00 2001
From: ooks-io <ooks@protonmail.com>
Date: Sat, 13 Apr 2024 18:43:43 +1200
Subject: [PATCH] refactor(nixarr): move nixarr module into ooksmedia host
 module

---
 system/hosts/ooksmedia/default.nix         |  3 ++-
 system/hosts/ooksmedia/nixarr.nix          | 22 +++++++++++++++
 system/modules/services/default.nix        |  2 --
 system/modules/services/nixarr/default.nix | 31 ----------------------
 system/profiles/default.nix                |  4 ---
 5 files changed, 24 insertions(+), 38 deletions(-)
 create mode 100644 system/hosts/ooksmedia/nixarr.nix
 delete mode 100644 system/modules/services/nixarr/default.nix

diff --git a/system/hosts/ooksmedia/default.nix b/system/hosts/ooksmedia/default.nix
index 7025b73..b0c4e3d 100644
--- a/system/hosts/ooksmedia/default.nix
+++ b/system/hosts/ooksmedia/default.nix
@@ -4,9 +4,10 @@
 	imports = [
 		./hardware-configuration.nix
     ../../profiles
+		./nixarr.nix
 		];
 
-    activeProfiles = ["base" "mediaServer" "gaming"];
+    activeProfiles = ["base" "gaming"];
 
 		systemModules.user = {
 			ooks.enable = true;
diff --git a/system/hosts/ooksmedia/nixarr.nix b/system/hosts/ooksmedia/nixarr.nix
new file mode 100644
index 0000000..ad8fa7a
--- /dev/null
+++ b/system/hosts/ooksmedia/nixarr.nix
@@ -0,0 +1,22 @@
+{ inputs, ... }:
+  
+  
+{
+  imports = [ inputs.nixarr.nixosModules.default ];
+  nixarr = {
+    enable = true;
+    mediaDir = "/jellyfin";
+    stateDir = "/var/lib/nixarr";
+    mediaUsers = ["ooks"];
+
+    jellyfin.enable = true;
+    sonarr.enable = true;
+    radarr.enable = true;
+    prowlarr.enable = true;
+    transmission.enable = true;
+  };
+  fileSystems."/jellyfin" = {
+    device = "/dev/disk/by-label/jellyfin";
+    fsType = "btrfs";
+  };
+}
diff --git a/system/modules/services/default.nix b/system/modules/services/default.nix
index 9cbbb38..f120163 100644
--- a/system/modules/services/default.nix
+++ b/system/modules/services/default.nix
@@ -4,14 +4,12 @@
   imports = [ 
   ./mediaServer
   ./system76Scheduler
-  ./nixarr
   ];
 
   options.systemModules.services = {
     mediaServer = {
       enable = lib.mkEnableOption "Enable mediaserver service module";
     };
-
   };
   
 }
diff --git a/system/modules/services/nixarr/default.nix b/system/modules/services/nixarr/default.nix
deleted file mode 100644
index 564a92b..0000000
--- a/system/modules/services/nixarr/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ lib, config, inputs, ... }:
-
-let
-  cfg = config.systemModules.services.nixarr;
-  inherit (lib) mkEnableOption mkIf;
-in
-
-{
-  options.systemModules.services.nixarr.enable = mkEnableOption "Enable nixarr module";
-
-  imports = [ inputs.nixarr.nixosModules.default ];
-
-  config = mkIf cfg.enable {
-    nixarr = {
-      enable = true;
-      mediaDir = "/jellyfin";
-      stateDir = "/var/lib/nixarr";
-      mediaUsers = ["ooks"];
-
-      jellyfin.enable = true;
-      sonarr.enable = true;
-      radarr.enable = true;
-      prowlarr.enable = true;
-      transmission.enable = true;
-    };
-    fileSystems."/jellyfin" = {
-      device = "/dev/disk/by-label/jellyfin";
-      fsType = "btrfs";
-    };
-  };
-}
diff --git a/system/profiles/default.nix b/system/profiles/default.nix
index 5139526..6bc7634 100644
--- a/system/profiles/default.nix
+++ b/system/profiles/default.nix
@@ -10,7 +10,6 @@ in
   imports = [
     ./base
     ./gaming
-    ./mediaServer
   ];
 
   options = {
@@ -26,9 +25,6 @@ in
       gaming = {
         enable = lib.mkEnableOption "Enable the gaming profile";
       };
-      mediaServer = {
-        enable = lib.mkEnableOption "Enable the mediaServer profile";
-      };
     };
   };