From 8aa5cf6ac6336102a2a21576ed37c7379f32032d Mon Sep 17 00:00:00 2001
From: noe <git@kat.cafe>
Date: Fri, 22 Dec 2023 20:36:24 -0500
Subject: [PATCH] aerial/blueberry: extract and enable dns cache

---
 nixos/features/dns-cache.nix      | 12 ++++++++++++
 nixos/hosts/aerial/default.nix    | 12 ++----------
 nixos/hosts/blueberry/default.nix |  1 +
 3 files changed, 15 insertions(+), 10 deletions(-)
 create mode 100644 nixos/features/dns-cache.nix

diff --git a/nixos/features/dns-cache.nix b/nixos/features/dns-cache.nix
new file mode 100644
index 0000000..f82f2f1
--- /dev/null
+++ b/nixos/features/dns-cache.nix
@@ -0,0 +1,12 @@
+{...}: {
+  networking.nameservers = [ "1.1.1.1#one.one.one.one" "1.0.0.1#one.one.one.one" ];
+  services.resolved = {
+    enable = true;
+    dnssec = "true";
+    domains = [ "~." ];
+    fallbackDns = [ "1.1.1.1#one.one.one.one" "1.0.0.1#one.one.one.one" ];
+    extraConfig = ''
+      DNSOverTLS=yes
+    '';
+  };
+}
diff --git a/nixos/hosts/aerial/default.nix b/nixos/hosts/aerial/default.nix
index 9442136..1f6ebfe 100644
--- a/nixos/hosts/aerial/default.nix
+++ b/nixos/hosts/aerial/default.nix
@@ -8,6 +8,7 @@
     ../../features/sound
     ../../features/nvidia.nix
     ../../features/steam.nix
+    ../../features/dns-cache.nix
   ];
 
   home-manager.users.noe = import ../../../home-manager/noe/hosts/aerial.nix;
@@ -28,15 +29,6 @@
   networking.firewall.allowedTCPPorts = [ 42069 ];
   networking.firewall.allowedUDPPorts = [ 42069 ];
 
-  networking.nameservers = [ "1.1.1.1#one.one.one.one" "1.0.0.1#one.one.one.one" ];
-  services.resolved = {
-    enable = true;
-    dnssec = "true";
-    domains = [ "~." ];
-    fallbackDns = [ "1.1.1.1#one.one.one.one" "1.0.0.1#one.one.one.one" ];
-    extraConfig = ''
-      DNSOverTLS=yes
-    '';
-  };
+  
 
 }
diff --git a/nixos/hosts/blueberry/default.nix b/nixos/hosts/blueberry/default.nix
index 42ce8e3..18f7de1 100644
--- a/nixos/hosts/blueberry/default.nix
+++ b/nixos/hosts/blueberry/default.nix
@@ -7,6 +7,7 @@
     
     ../../features/podman.nix
     ../../features/nginx.nix
+    ../../features/dns-cache.nix
 
     ../../stacks/ps2.live
   ];