From 54c2240be6c57c2dc19af763b97a939d4fb6ce3c Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Fri, 8 Mar 2024 17:44:25 +0800
Subject: [PATCH] feat: update dae & its config

---
 Justfile                          | 2 +-
 flake.lock                        | 6 +++---
 hosts/idols_aquamarine/config.dae | 7 ++++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Justfile b/Justfile
index 462e2f03..391cfbb3 100644
--- a/Justfile
+++ b/Justfile
@@ -114,7 +114,7 @@ lab:
 aqua:
   colmena apply --on '@aqua' --verbose --show-trace
   # some config changes require a restart of the dae service
-  ssh ryan@aquamarine "sudo systemctl stop dae; sleep 1; sudo systemctl start dae"
+  ssh root@aquamarine "sudo systemctl stop dae; sleep 1; sudo systemctl start dae"
 
 ruby:
   colmena apply --on '@ruby' --verbose --show-trace
diff --git a/flake.lock b/flake.lock
index 8a5d7eed..d6bed045 100644
--- a/flake.lock
+++ b/flake.lock
@@ -145,11 +145,11 @@
         "pre-commit-hooks": "pre-commit-hooks"
       },
       "locked": {
-        "lastModified": 1709381418,
-        "narHash": "sha256-2TXn+W/hVN2DIYGU7hHaipmFzjNgDAb8i5We46urLBg=",
+        "lastModified": 1709777987,
+        "narHash": "sha256-rGjM51lS7KumEvJlWGC2ufgBKVCG5DM/3naYWhMv23Q=",
         "owner": "daeuniverse",
         "repo": "flake.nix",
-        "rev": "655a02dea1720eedc36a09e55b9a764115dbce1c",
+        "rev": "7b867cfa5a8ee56fc20425f9c09b4feee27d5f76",
         "type": "github"
       },
       "original": {
diff --git a/hosts/idols_aquamarine/config.dae b/hosts/idols_aquamarine/config.dae
index df95dedd..230d3cb0 100644
--- a/hosts/idols_aquamarine/config.dae
+++ b/hosts/idols_aquamarine/config.dae
@@ -136,6 +136,7 @@ dns {
 
             # other custom rules
             qname(full:analytics.google.com) -> googledns # do not block google analytics(console)
+            qname(regex: '.+\.nixos.org$') -> googledns
             qname(geosite:category-ads) -> reject
             qname(geosite:category-ads-all) -> reject
             qtype(aaaa) -> reject
@@ -168,9 +169,9 @@ group {
         filter: name(keyword: 'USA') [add_latency: -500ms]
         filter: name(keyword: '美国') [add_latency: -500ms]
         filter: name(keyword: 'UK') [add_latency: -300ms]
-        filter: name(keyword: '英国') [add_latency: -300ms]
-        filter: name(keyword: 'Japan') [add_latency: 300ms]
-        filter: name(keyword: '日本') [add_latency: 300ms]
+        # filter: name(keyword: '英国') [add_latency: -300ms]
+        # filter: name(keyword: 'Japan') [add_latency: 300ms]
+        # filter: name(keyword: '日本') [add_latency: 300ms]
 
         # Other filters:
         #   Filter nodes from the global node pool defined by the subscription and node section above.