From 3bd5491832498318b9fcd7936f98d462cb28dcaa Mon Sep 17 00:00:00 2001
From: Fuwn <contact@fuwn.me>
Date: Wed, 25 Sep 2024 02:59:42 -0700
Subject: resolved: move to core

---
 modules/core/networking/default.nix     |  1 +
 modules/core/networking/resolved.nix    | 17 +++++++++++++++++
 modules/desktop/networking/default.nix  |  1 -
 modules/desktop/networking/resolved.nix | 17 -----------------
 4 files changed, 18 insertions(+), 18 deletions(-)
 create mode 100644 modules/core/networking/resolved.nix
 delete mode 100644 modules/desktop/networking/resolved.nix

diff --git a/modules/core/networking/default.nix b/modules/core/networking/default.nix
index 608be0b..ebdcd55 100644
--- a/modules/core/networking/default.nix
+++ b/modules/core/networking/default.nix
@@ -2,6 +2,7 @@
 {
   imports = [
     ./firewall
+    ./resolved.nix
     ./tailscale.nix
   ];
 
diff --git a/modules/core/networking/resolved.nix b/modules/core/networking/resolved.nix
new file mode 100644
index 0000000..82effbe
--- /dev/null
+++ b/modules/core/networking/resolved.nix
@@ -0,0 +1,17 @@
+{ secrets, ... }:
+{
+  services.resolved = {
+    enable = false;
+    dnssec = "true";
+    domains = [ "~." ];
+    dnsovertls = "true";
+    llmnr = "false";
+
+    extraConfig = ''
+      DNS=45.90.28.0#${secrets.nextdns_id}.dns.nextdns.io
+      DNS=2a07:a8c0::#${secrets.nextdns_id}.dns.nextdns.io
+      DNS=45.90.30.0#${secrets.nextdns_id}.dns.nextdns.io
+      DNS=2a07:a8c1::#${secrets.nextdns_id}.dns.nextdns.io
+    '';
+  };
+}
diff --git a/modules/desktop/networking/default.nix b/modules/desktop/networking/default.nix
index d8fd85e..a848e1c 100644
--- a/modules/desktop/networking/default.nix
+++ b/modules/desktop/networking/default.nix
@@ -8,7 +8,6 @@
     ./networkmanager.nix
     ./optimise.nix
     ./pia.nix
-    ./resolved.nix
     ./tor.nix
     ./upnp.nix
   ];
diff --git a/modules/desktop/networking/resolved.nix b/modules/desktop/networking/resolved.nix
deleted file mode 100644
index 82effbe..0000000
--- a/modules/desktop/networking/resolved.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ secrets, ... }:
-{
-  services.resolved = {
-    enable = false;
-    dnssec = "true";
-    domains = [ "~." ];
-    dnsovertls = "true";
-    llmnr = "false";
-
-    extraConfig = ''
-      DNS=45.90.28.0#${secrets.nextdns_id}.dns.nextdns.io
-      DNS=2a07:a8c0::#${secrets.nextdns_id}.dns.nextdns.io
-      DNS=45.90.30.0#${secrets.nextdns_id}.dns.nextdns.io
-      DNS=2a07:a8c1::#${secrets.nextdns_id}.dns.nextdns.io
-    '';
-  };
-}
-- 
cgit v1.2.3