From 9a73fab3074dae0e1125d0b23efa40ea19430c38 Mon Sep 17 00:00:00 2001
From: notohh <github@notohh.dev>
Date: Wed, 17 Jan 2024 09:03:34 -0500
Subject: [PATCH] blocky: updates

---
 hosts/haru/services/blocky.nix | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/hosts/haru/services/blocky.nix b/hosts/haru/services/blocky.nix
index 09733ca..745dd59 100644
--- a/hosts/haru/services/blocky.nix
+++ b/hosts/haru/services/blocky.nix
@@ -1,8 +1,4 @@
-{
-  pkgs,
-  config,
-  ...
-}: {
+{pkgs, ...}: {
   networking.firewall.allowedTCPPorts = [53 4000];
   networking.firewall.allowedUDPPorts = [53];
 
@@ -12,7 +8,7 @@
     enable = true;
     settings = {
       connectIPVersion = "v4";
-      upstreamTimeout = "30s";
+      upstreamTimeout = "5s";
       startVerifyUpstream = false;
       minTlsServeVersion = "1.2";
       log = {
@@ -23,12 +19,24 @@
         dns = 53;
         http = 4000;
         https = 443;
+        tls = 853;
+      };
+      upstreams = {
+        strategy = "strict";
+        timeout = "30s";
+        groups = {
+          default = [
+            "tcp+udp:127.0.0.1:5335"
+            "tcp-tls:dns.quad9.net"
+          ];
+        };
       };
-      upstream.default = ["tcp+udp:127.0.0.1:5335"];
       blocking = {
+        blockType = "nxDomain";
         loading = {
           strategy = "fast";
           concurrency = 8;
+          refreshPeriod = "4h";
         };
         blackLists = {
           ads = [
@@ -64,6 +72,9 @@
             "https://zerodot1.gitlab.io/CoinBlockerLists/hosts_browser"
             "https://raw.githubusercontent.com/StevenBlack/hosts/master/alternates/fakenews-only/hosts"
           ];
+          catchall = [
+            "https://big.oisd.nl/domainswild"
+          ];
         };
         whiteLists = {
           default = [
@@ -77,6 +88,7 @@
             "tracking"
             "malicious"
             "misc"
+            "catchall"
           ];
         };
       };
@@ -115,7 +127,7 @@
       redis = {
         address = "100.94.214.100:6381";
         password = "blocky";
-        database = 2;
+        database = 0;
         required = false;
         connectionAttempts = 10;
         connectionCooldown = "5s";
@@ -132,6 +144,9 @@
         enable = true;
         path = "/metrics";
       };
+      queryLog = {
+        type = "console";
+      };
     };
   };
 }