From 1083ad8d4023dd3405af94092c3d0e0e333663db Mon Sep 17 00:00:00 2001
From: rocketcamel <luca_lise@icloud.com>
Date: Mon, 17 Nov 2025 10:32:57 -0800
Subject: [PATCH] fix: move dns configuration into module

---
 nix/hosts/usahara/configuration.nix |  8 ------
 nix/modules/commonPackages.nix      | 17 -------------
 nix/modules/default.nix             |  1 +
 nix/modules/dns.nix                 | 39 +++++++++++++++++++++++++++++
 4 files changed, 40 insertions(+), 25 deletions(-)
 create mode 100644 nix/modules/dns.nix

diff --git a/nix/hosts/usahara/configuration.nix b/nix/hosts/usahara/configuration.nix
index e53516f..4024de7 100644
--- a/nix/hosts/usahara/configuration.nix
+++ b/nix/hosts/usahara/configuration.nix
@@ -26,14 +26,6 @@
   };
 
   networking.hostName = meta.hostname;
-  networking.networkmanager = {
-    enable = true;
-    dns = "systemd-resolved";
-  };
-  # networking.search = [
-  #   "service.consul"
-  #   "node.consul"
-  # ];
   hardware.bluetooth.enable = true;
   swapDevices = [
     {
diff --git a/nix/modules/commonPackages.nix b/nix/modules/commonPackages.nix
index 4a51733..daf4222 100644
--- a/nix/modules/commonPackages.nix
+++ b/nix/modules/commonPackages.nix
@@ -86,23 +86,6 @@
     services.pcscd.enable = true;
     services.udev.packages = with pkgs; [ yubikey-personalization ];
 
-    services.resolved = {
-      enable = true;
-      fallbackDns = [
-        "1.1.1.1"
-        "1.0.0.1"
-      ];
-      domains = [
-        "consul"
-        "service.consul"
-        "node.consul"
-      ];
-      extraConfig = ''
-        [Resolve]
-        DNS=192.168.20.5:8600
-      '';
-    };
-
     programs.neovim = lib.mkDefault {
       enable = true;
       defaultEditor = true;
diff --git a/nix/modules/default.nix b/nix/modules/default.nix
index 0f0833e..4b2f794 100644
--- a/nix/modules/default.nix
+++ b/nix/modules/default.nix
@@ -18,5 +18,6 @@
     ./virtualization.nix
     ./printing.nix
     ./sensors.nix
+    ./dns.nix
   ];
 }
diff --git a/nix/modules/dns.nix b/nix/modules/dns.nix
new file mode 100644
index 0000000..1035b65
--- /dev/null
+++ b/nix/modules/dns.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+  config,
+  ...
+}:
+{
+  options.dns = {
+    enable = lib.mkOption {
+      type = lib.types.bool;
+      default = true;
+      description = "enable dns";
+    };
+  };
+
+  config = lib.mkIf config.dns.enable {
+    networking.networkmanager = {
+      enable = true;
+      dns = "systemd-resolved";
+    };
+
+    services.resolved = {
+      enable = true;
+      fallbackDns = [
+        "1.1.1.1"
+        "1.0.0.1"
+      ];
+      domains = [
+        "consul"
+        "service.consul"
+        "node.consul"
+      ];
+      extraConfig = ''
+        [Resolve]
+        DNS=192.168.20.5:8600
+      '';
+    };
+
+  };
+}