From d6a3036bd153585546b2c84023a8bfbe75bc31eb Mon Sep 17 00:00:00 2001
From: Danilo Reyes <CaptainJawZ@protonmail.com>
Date: Wed, 13 Nov 2024 22:25:51 -0600
Subject: [PATCH] servers arr adjustment + formatting

---
 modules/servers/atticd.nix    | 8 ++------
 modules/servers/nix-serve.nix | 2 +-
 modules/servers/radarr.nix    | 7 +------
 modules/servers/sonarr.nix    | 2 +-
 modules/servers/tranga.nix    | 6 +-----
 5 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/modules/servers/atticd.nix b/modules/servers/atticd.nix
index 2064e7b..228b6e6 100644
--- a/modules/servers/atticd.nix
+++ b/modules/servers/atticd.nix
@@ -1,8 +1,4 @@
-{
-  lib,
-  config,
-  ...
-}:
+{ lib, config, ... }:
 let
   cfg = config.my.servers.atticd;
   setup = import ./setup.nix { inherit lib config; };
@@ -35,7 +31,7 @@ in
         };
       };
       nginx.virtualHosts."${cfg.host}" = lib.mkIf cfg.enableProxy (
-        setup.proxyReverse cfg.hostName cfg.port // { }
+        setup.proxyReverseArr cfg.hostName cfg.port // { }
       );
     };
   };
diff --git a/modules/servers/nix-serve.nix b/modules/servers/nix-serve.nix
index 9b2e3f3..b413e5c 100644
--- a/modules/servers/nix-serve.nix
+++ b/modules/servers/nix-serve.nix
@@ -17,7 +17,7 @@ in
         enable = true;
         openFirewall = true;
         package = pkgs.nix-serve-ng;
-        port = cfg.port;
+        inherit (cfg) port;
         secretKeyFile = config.sops.secrets."private_cache_keys/miniserver".path;
       };
       nginx.virtualHosts."${cfg.host}" = lib.mkIf cfg.enableProxy (
diff --git a/modules/servers/radarr.nix b/modules/servers/radarr.nix
index a3d1a14..2ade30f 100644
--- a/modules/servers/radarr.nix
+++ b/modules/servers/radarr.nix
@@ -1,9 +1,4 @@
-{
-  lib,
-  config,
-  proxyReverseArr,
-  ...
-}:
+{ lib, config, ... }:
 let
   cfg = config.my.servers.radarr;
   setup = import ./setup.nix { inherit lib config; };
diff --git a/modules/servers/sonarr.nix b/modules/servers/sonarr.nix
index 7fb368d..98f148c 100644
--- a/modules/servers/sonarr.nix
+++ b/modules/servers/sonarr.nix
@@ -13,7 +13,7 @@ in
         group = "piracy";
       };
       nginx.virtualHosts."${cfg.host}" = lib.mkIf cfg.enableProxy (
-        setup.proxyReverse cfg.hostName cfg.port // { }
+        setup.proxyReverseArr cfg.hostName cfg.port // { }
       );
     };
   };
diff --git a/modules/servers/tranga.nix b/modules/servers/tranga.nix
index 7450aa8..4cf35d5 100644
--- a/modules/servers/tranga.nix
+++ b/modules/servers/tranga.nix
@@ -1,8 +1,4 @@
-{
-  config,
-  lib,
-  ...
-}:
+{ config, lib, ... }:
 let
   setup = import ./setup.nix { inherit lib config; };
   cfg = config.my.servers.tranga;