From 9ea6397786fc032be68594721a70802226f51143 Mon Sep 17 00:00:00 2001
From: SebastianStork <sebastian.stork@pm.me>
Date: Tue, 23 Sep 2025 22:52:59 +0200
Subject: [PATCH] resolved: Remove module as it's enabled by default when using
 networkd

---
 hosts/desktop/default.nix            |  1 -
 hosts/laptop/default.nix             |  1 -
 hosts/srv-monitor/default.nix        |  1 -
 hosts/srv-private/default.nix        |  1 -
 hosts/srv-public/default.nix         |  1 -
 modules/system/meta/ports.nix        | 18 +++++++++++++++---
 modules/system/services/resolved.nix | 21 ---------------------
 7 files changed, 15 insertions(+), 29 deletions(-)
 delete mode 100644 modules/system/services/resolved.nix

diff --git a/hosts/desktop/default.nix b/hosts/desktop/default.nix
index 37475a1..422cb8a 100644
--- a/hosts/desktop/default.nix
+++ b/hosts/desktop/default.nix
@@ -21,7 +21,6 @@
     de.hyprland.enable = true;
 
     services = {
-      resolved.enable = true;
       gc.enable = true;
       sound.enable = true;
       geoclue.enable = true;
diff --git a/hosts/laptop/default.nix b/hosts/laptop/default.nix
index e01ca58..806c5e2 100644
--- a/hosts/laptop/default.nix
+++ b/hosts/laptop/default.nix
@@ -21,7 +21,6 @@
     de.hyprland.enable = true;
 
     services = {
-      resolved.enable = true;
       gc.enable = true;
       wlan.enable = true;
       bluetooth.enable = true;
diff --git a/hosts/srv-monitor/default.nix b/hosts/srv-monitor/default.nix
index 35a4f33..dfe4f62 100644
--- a/hosts/srv-monitor/default.nix
+++ b/hosts/srv-monitor/default.nix
@@ -22,7 +22,6 @@
         tailscaleDomain = config.custom.services.tailscale.domain;
       in
       {
-        resolved.enable = true;
         tailscale = {
           enable = true;
           ssh.enable = true;
diff --git a/hosts/srv-private/default.nix b/hosts/srv-private/default.nix
index 9c1ac99..5e57cee 100644
--- a/hosts/srv-private/default.nix
+++ b/hosts/srv-private/default.nix
@@ -20,7 +20,6 @@
         tailscaleDomain = config.custom.services.tailscale.domain;
       in
       {
-        resolved.enable = true;
         tailscale = {
           enable = true;
           ssh.enable = true;
diff --git a/hosts/srv-public/default.nix b/hosts/srv-public/default.nix
index 2d61d8e..f2aec4f 100644
--- a/hosts/srv-public/default.nix
+++ b/hosts/srv-public/default.nix
@@ -20,7 +20,6 @@
         sproutedDomain = "sprouted.cloud";
       in
       {
-        resolved.enable = true;
         tailscale = {
           enable = true;
           ssh.enable = true;
diff --git a/modules/system/meta/ports.nix b/modules/system/meta/ports.nix
index 1ff2bd0..86d05c8 100644
--- a/modules/system/meta/ports.nix
+++ b/modules/system/meta/ports.nix
@@ -21,7 +21,7 @@ in
     validate = lib.mkEnableOption "";
   };
 
-  config = lib.mkIf cfg.validate {
+  config = {
     assertions =
       let
         findDuplicatePorts =
@@ -49,10 +49,9 @@ in
           |> lib.concatStrings;
 
         duplicateTcpPorts = findDuplicatePorts "tcp";
-
         duplicateUdpPorts = findDuplicatePorts "udp";
       in
-      [
+      lib.mkIf cfg.validate [
         {
           assertion = duplicateTcpPorts == { };
           message = mkErrorMessage duplicateTcpPorts;
@@ -62,5 +61,18 @@ in
           message = mkErrorMessage duplicateUdpPorts;
         }
       ];
+
+    meta.ports =
+      let
+        resolvedPorts = lib.mkIf config.services.resolved.enable [
+          53
+          5353
+          5355
+        ];
+      in
+      {
+        tcp.list = resolvedPorts;
+        udp.list = resolvedPorts;
+      };
   };
 }
diff --git a/modules/system/services/resolved.nix b/modules/system/services/resolved.nix
deleted file mode 100644
index a5624ce..0000000
--- a/modules/system/services/resolved.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ config, lib, ... }:
-{
-  options.custom.services.resolved.enable = lib.mkEnableOption "";
-
-  config = lib.mkIf config.custom.services.resolved.enable {
-    meta.ports =
-      let
-        ports = [
-          53
-          5353
-          5355
-        ];
-      in
-      {
-        tcp.list = ports;
-        udp.list = ports;
-      };
-
-    services.resolved.enable = true;
-  };
-}