From a02bbd1cc9abc051da376917a75f79ad3d7aef66 Mon Sep 17 00:00:00 2001
From: Danilo Reyes <CaptainJawZ@protonmail.com>
Date: Fri, 5 Jul 2024 21:05:52 -0600
Subject: [PATCH] removed serviceBase function

---
 modules/servers.nix        | 20 +++++---------------
 modules/servers/bazarr.nix |  7 +++++--
 modules/servers/radarr.nix |  7 +++++--
 modules/servers/sonarr.nix |  7 +++++--
 4 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/modules/servers.nix b/modules/servers.nix
index ca343b2..d332a42 100644
--- a/modules/servers.nix
+++ b/modules/servers.nix
@@ -1,10 +1,6 @@
 { lib, config, pkgs, ... }:
 let
   setup = import ./servers/base.nix { inherit lib config; };
-  serviceBase = {
-    enable = true;
-    group = "piracy";
-  };
   proxy = locations: {
     inherit locations;
     forceSSL = true;
@@ -45,12 +41,10 @@ in {
     ./servers/paperless.nix
     ./servers/postgres.nix
     (import ./servers/audiobookshelf.nix { inherit lib config proxy setup; })
-    (import ./servers/bazarr.nix {
-      inherit lib config serviceBase proxyReverse;
-    })
+    (import ./servers/bazarr.nix { inherit lib config proxyReverse; })
     (import ./servers/flame.nix { inherit lib config proxyReverse; })
     (import ./servers/homepage.nix { inherit lib config pkgs proxyReverse; })
-    (import ./servers/jellyfin.nix { inherit lib config pkgs serviceBase; })
+    (import ./servers/jellyfin.nix { inherit lib config pkgs setup; })
     (import ./servers/kavita.nix { inherit lib config pkgs proxyReverse; })
     (import ./servers/lidarr.nix { inherit lib config proxyReverseArr; })
     (import ./servers/maloja.nix { inherit lib config proxyReverse; })
@@ -58,17 +52,13 @@ in {
     (import ./servers/metube.nix { inherit lib config proxyReverse; })
     (import ./servers/microbin.nix { inherit lib config proxyReverse; })
     (import ./servers/multi-scrobbler.nix { inherit lib config proxyReverse; })
-    (import ./servers/nextcloud.nix { inherit lib config pkgs serviceBase; })
+    (import ./servers/nextcloud.nix { inherit lib config pkgs; })
     (import ./servers/prowlarr.nix { inherit lib config proxyReverseArr; })
     (import ./servers/qbittorrent.nix { inherit lib config pkgs proxyReverse; })
-    (import ./servers/radarr.nix {
-      inherit lib config serviceBase proxyReverseArr;
-    })
+    (import ./servers/radarr.nix { inherit lib config proxyReverseArr; })
     (import ./servers/ryot.nix { inherit lib config proxyReverse; })
     (import ./servers/shiori.nix { inherit lib config pkgs proxyReverse; })
-    (import ./servers/sonarr.nix {
-      inherit lib config serviceBase proxyReverse;
-    })
+    (import ./servers/sonarr.nix { inherit lib config proxyReverse; })
     (import ./servers/vaultwarden.nix { inherit lib config pkgs proxyReverse; })
     (import ./servers/firefly-iii.nix { inherit lib config pkgs proxyReverse; })
   ];
diff --git a/modules/servers/bazarr.nix b/modules/servers/bazarr.nix
index 2e542db..3657c32 100644
--- a/modules/servers/bazarr.nix
+++ b/modules/servers/bazarr.nix
@@ -1,8 +1,11 @@
-{ lib, config, serviceBase, proxyReverse, ... }: {
+{ lib, config, proxyReverse, ... }: {
   options.my.servers.bazarr.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.servers.bazarr.enable {
     services = {
-      bazarr = serviceBase // { };
+      bazarr = {
+        enable = true;
+        group = "piracy";
+      };
       nginx = {
         enable = true;
         virtualHosts."subs.${config.my.domain}" =
diff --git a/modules/servers/radarr.nix b/modules/servers/radarr.nix
index 3dfb7a7..7900795 100644
--- a/modules/servers/radarr.nix
+++ b/modules/servers/radarr.nix
@@ -1,8 +1,11 @@
-{ lib, config, serviceBase, proxyReverseArr, ... }: {
+{ lib, config, proxyReverseArr, ... }: {
   options.my.servers.radarr.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.servers.radarr.enable {
     services = {
-      radarr = serviceBase // { };
+      radarr = {
+        enable = true;
+        group = "piracy";
+      };
       nginx = {
         enable = true;
         virtualHosts."movies.${config.my.domain}" = proxyReverseArr 7878 // { };
diff --git a/modules/servers/sonarr.nix b/modules/servers/sonarr.nix
index a5479a3..9facb0e 100644
--- a/modules/servers/sonarr.nix
+++ b/modules/servers/sonarr.nix
@@ -1,8 +1,11 @@
-{ lib, config, serviceBase, proxyReverse, ... }: {
+{ lib, config, proxyReverse, ... }: {
   options.my.servers.sonarr.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.servers.sonarr.enable {
     services = {
-      sonarr = serviceBase // { };
+      sonarr = {
+        enable = true;
+        group = "piracy";
+      };
       nginx = {
         enable = true;
         virtualHosts."series.${config.my.domain}" = proxyReverse 8989 // { };