From e16e0e82e56f0d48ccb65835ffab6fd0983d26b5 Mon Sep 17 00:00:00 2001
From: mjallen18 <matt.l.jallen@gmail.com>
Date: Mon, 12 May 2025 13:01:12 -0500
Subject: [PATCH] adguard stuffs

---
 hosts/pi4/adguard.nix    | 32 ++++++++++++++++++++++++++++++--
 hosts/pi4/networking.nix | 11 +++++------
 2 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/hosts/pi4/adguard.nix b/hosts/pi4/adguard.nix
index c8168f0..16b85fb 100644
--- a/hosts/pi4/adguard.nix
+++ b/hosts/pi4/adguard.nix
@@ -4,5 +4,33 @@
     enable = true;
     openFirewall = true;
     mutableSettings = true;
-  }
-}
\ No newline at end of file
+    settings = {
+      users = [
+        {
+          name = "mjallen";
+          password = "$2a$10$G07P7V1EnBQxWtMNGyfgTOTpAgr4d.uqYoG.cGSFCv9jQdiYWCsfq";
+        }
+      ];
+      dns = {
+        upstream_dns = [
+          "https://dns10.quad9.net/dns-query"
+          "1.1.1.1"
+          "8.8.8.8"
+        ];
+        bootstrap_dns = [
+          "9.9.9.10"
+          "149.112.112.10"
+          "2620:fe::10"
+          "2620:fe::fe:10"
+        ];
+        upstream_mode = "load_balance";
+        trusted_proxies = [
+          "127.0.0.0/8"
+          "::1/128"
+          "10.0.1.18"
+        ];
+        cache_optimistic = true;
+      };
+    };
+  };
+}
diff --git a/hosts/pi4/networking.nix b/hosts/pi4/networking.nix
index 45e253f..8b9da60 100755
--- a/hosts/pi4/networking.nix
+++ b/hosts/pi4/networking.nix
@@ -13,6 +13,8 @@ in
     firewall = {
       enable = true;
       allowPing = true;
+      allowedTCPPorts = [ 80 ];
+      allowedUDPPorts = [ 80 ];
     };
 
     # Enable Network Manager
@@ -57,12 +59,9 @@ in
 
             ipv4 = {
               method = "manual";
-              address-data = [{
-                address = "10.0.1.2";
-                prefix = 24;
-              }];
+              address = "10.0.1.2/24";
               gateway = "10.0.1.1";
-              dns = [ "10.0.1.1" "1.1.1.1" ];
+              dns = "1.1.1.1";
             };
             ipv6 = {
               addr-gen-mode = "stable-privacy";
@@ -73,4 +72,4 @@ in
       };
     };
   };
-}
\ No newline at end of file
+}