From 52a5a7e7d2d45229ecd4d3553a8b6ae11ac9ed50 Mon Sep 17 00:00:00 2001
From: Giulio De Pasquale <git@depasquale.giugl.io>
Date: Sat, 26 Apr 2025 19:43:22 +0100
Subject: [PATCH] fix: other services

---
 hosts/architect/default.nix            | 49 +++++++-------------------
 hosts/architect/dns.nix                | 12 +------
 modules/services/jellyseer/default.nix |  3 +-
 modules/services/prowlarr/default.nix  |  3 +-
 4 files changed, 15 insertions(+), 52 deletions(-)

diff --git a/hosts/architect/default.nix b/hosts/architect/default.nix
index d6b1ee0..2cb95c4 100644
--- a/hosts/architect/default.nix
+++ b/hosts/architect/default.nix
@@ -1,12 +1,9 @@
-{ config, pkgs, lib, ... }:
+{ config, pkgs, ... }:
 
 let
   macbookPubkey = (import ../pubkeys.nix).macbook;
   pubkeys = [ macbookPubkey ];
   domain = "devs.giugl.io";
-
-  utilities = import ./utilities.nix { inherit lib config; };
-  inherit (utilities) generateDeviceStrings;
 in
 {
   imports = [
@@ -15,21 +12,15 @@ in
     ./hardware.nix
     ./firewall.nix
     ./nginx.nix
-    # ./sonarr.nix
-    # ./bazarr.nix
-    # ./nzbget.nix
     ./nextcloud.nix
     ./matrix.nix
     ./fail2ban.nix
     ./dns.nix
-    ./prowlarr.nix
     ./redlib.nix
-    # ./jellyfin.nix
     ./tailscale.nix
     ./headscale.nix
     ./llm.nix
     ./sunshine.nix
-    ./jellyseer.nix
     ./postgres.nix
     ./netdata.nix
     ./homeassistant.nix
@@ -91,26 +82,6 @@ in
         prefixLength = 24;
       }];
     };
-    extraHosts = (generateDeviceStrings config.pepe.core.network.interfaces.lan.devices) + ''
-
-      # Blacklist
-      0.0.0.0                metrics.plex.tv
-      0.0.0.0                analytics.plex.tv
-      0.0.0.0                cdn.luckyorange.com
-      0.0.0.0                w1.luckyorange.com
-      0.0.0.0                browser.sentry-cdn.com
-      0.0.0.0                analytics.facebook.com
-      0.0.0.0                ads.facebook.com
-      0.0.0.0                extmaps-api.yandex.net
-      0.0.0.0                logservice.hicloud.com
-      0.0.0.0                logbak.hicloud.com
-      0.0.0.0                logservice1.hicloud.com
-      0.0.0.0                samsung-com.112.2o7.net
-      0.0.0.0                supportmetrics.apple.com
-      0.0.0.0                analytics.oneplus.cn
-      0.0.0.0                click.oneplus.cn
-      0.0.0.0        analytics-api.samsunghealthcn.com
-    '';
   };
 
   services = {
@@ -168,11 +139,6 @@ in
         package = pkgs.unstablePkgs.immich;
       };
 
-      # minio = {
-      #   enable = true;
-      #   domain = "s3.giugl.io";
-      # };
-
       radarr = {
         enable = true;
         domain = "htrad.giugl.io";
@@ -190,19 +156,28 @@ in
         domain = "htbaz.giugl.io";
         package = pkgs.unstablePkgs.bazarr;
       };
-      
+
       nzbget = {
         enable = true;
         domain = "htnzb.giugl.io";
         package = pkgs.unstablePkgs.nzbget;
       };
 
-
       jellyfin = {
         enable = true;
         domain = "media.giugl.io";
         package = pkgs.unstablePkgs.jellyfin;
       };
+      
+      jellyseer = {
+        enable = true;
+        domain = "aumm-aumm.giugl.io";
+      };
+      
+      prowlarr = {
+        enable = true;
+        domain = "htpro.giugl.io";
+      };
     };
   };
 }
diff --git a/hosts/architect/dns.nix b/hosts/architect/dns.nix
index 79fe1bb..a57e590 100644
--- a/hosts/architect/dns.nix
+++ b/hosts/architect/dns.nix
@@ -1,7 +1,6 @@
-{ config, pkgs, ... }:
+{ ... }:
 
 {
-  # Enable the DNS module
   pepe.core.dns = {
     enable = true;
     nextDNSId = "d65174";
@@ -11,13 +10,4 @@
       };
     };
   };
-
-  # Configure AdGuard
-  pepe.core.vhost.hosts."adguard.giugl.io" = {
-    locations."/" = {
-      port = config.services.adguardhome.port;
-      allowLAN = true;
-      allowVPN = true;
-    };
-  };
 }
diff --git a/modules/services/jellyseer/default.nix b/modules/services/jellyseer/default.nix
index 5e1df9b..2ad3aed 100644
--- a/modules/services/jellyseer/default.nix
+++ b/modules/services/jellyseer/default.nix
@@ -21,8 +21,7 @@ in
       package = cfg.package;
     };
 
-    pepe.core.vhost.hosts.${cfg.domain} = with config.pepe.core.network; {
-      dnsInterfaces = [ interfaceTypes.vpn interfaceTypes.lan ];
+    pepe.core.vhost.hosts.${cfg.domain} = {
       locations."/" = {
         port = config.services.jellyseerr.port;
         allowLAN = true;
diff --git a/modules/services/prowlarr/default.nix b/modules/services/prowlarr/default.nix
index 547b6b1..2d71755 100644
--- a/modules/services/prowlarr/default.nix
+++ b/modules/services/prowlarr/default.nix
@@ -21,8 +21,7 @@ in
       package = cfg.package;
     };
 
-    pepe.core.vhost.hosts.${cfg.domain} = with config.pepe.core.network; {
-      dnsInterfaces = [ interfaceTypes.vpn interfaceTypes.lan ];
+    pepe.core.vhost.hosts.${cfg.domain} = {
       locations."/" = {
         port = 9696;
         allowLAN = true;