From 0ff294f033f8277d2eb59f8e1a4dbdcd7d7ad300 Mon Sep 17 00:00:00 2001
From: Kopatz <7265381+Kropatz@users.noreply.github.com>
Date: Tue, 9 Jul 2024 15:03:08 +0200
Subject: [PATCH] move rewrites

---
 modules/services/adguard.nix | 52 +++++++++++++++++++-----------------
 1 file changed, 27 insertions(+), 25 deletions(-)

diff --git a/modules/services/adguard.nix b/modules/services/adguard.nix
index 1d2e27c..cf6df34 100644
--- a/modules/services/adguard.nix
+++ b/modules/services/adguard.nix
@@ -66,6 +66,33 @@ in {
             "tls://dot.seby.io"
           ];
           use_http3_upstreams = true;
+        };
+        querylog = { enabled = false; };
+        filters = [
+          {
+            enabled = true;
+            url =
+              "https://adguardteam.github.io/HostlistsRegistry/assets/filter_1.txt";
+            name = "adguard dns list";
+            id = 1;
+          }
+          {
+            enabled = true;
+            url =
+              "https://adguardteam.github.io/HostlistsRegistry/assets/filter_2.txt";
+            name = "adguard block list";
+            id = 2;
+          }
+          {
+            enabled = true;
+            url = "https://dbl.oisd.nl/";
+            name = "big block list";
+            id = 3;
+          }
+        ];
+        dhcp = { enabled = false; };
+        tls = { enabled = false; };
+        filtering = {
           rewrites = [
             {
               "domain" = "kopatz.ddns.net";
@@ -133,31 +160,6 @@ in {
             }
           ];
         };
-        querylog = { enabled = false; };
-        filters = [
-          {
-            enabled = true;
-            url =
-              "https://adguardteam.github.io/HostlistsRegistry/assets/filter_1.txt";
-            name = "adguard dns list";
-            id = 1;
-          }
-          {
-            enabled = true;
-            url =
-              "https://adguardteam.github.io/HostlistsRegistry/assets/filter_2.txt";
-            name = "adguard block list";
-            id = 2;
-          }
-          {
-            enabled = true;
-            url = "https://dbl.oisd.nl/";
-            name = "big block list";
-            id = 3;
-          }
-        ];
-        dhcp = { enabled = false; };
-        tls = { enabled = false; };
       };
     };
   };