From 4d24c74c16cc7ca8530e8d19fc3db1986fcfa8cf Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Thu, 29 Feb 2024 22:23:55 +0800
Subject: [PATCH] feat: aqua - use dae - pr458

---
 flake.lock                        | 8 ++++----
 flake.nix                         | 3 ++-
 hosts/idols_aquamarine/config.dae | 9 ++-------
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/flake.lock b/flake.lock
index 9ba0b49c..dcb3e006 100644
--- a/flake.lock
+++ b/flake.lock
@@ -102,16 +102,16 @@
         "pre-commit-hooks": "pre-commit-hooks"
       },
       "locked": {
-        "lastModified": 1708006709,
-        "narHash": "sha256-5WSBOUuYtPfpCL0v5scEVRis1qjv1haL3tmwM/LJPT8=",
+        "lastModified": 1709183670,
+        "narHash": "sha256-VcixQ0uSUZYYzXeSx+UTy8MfFfgVf67cjg6nOBQjrDg=",
         "owner": "daeuniverse",
         "repo": "flake.nix",
-        "rev": "5bb02d49a4ec48019758cf3893a6f614d307df0b",
+        "rev": "5053aedaae52c54c9bd7fce6799e1062f954cec7",
         "type": "github"
       },
       "original": {
         "owner": "daeuniverse",
-        "ref": "unstable",
+        "ref": "exp",
         "repo": "flake.nix",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 163d93b4..77ba881a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -164,7 +164,8 @@
 
     nuenv.url = "github:DeterminateSystems/nuenv";
 
-    daeuniverse.url = "github:daeuniverse/flake.nix/unstable";
+    # daeuniverse.url = "github:daeuniverse/flake.nix/unstable";
+    daeuniverse.url = "github:daeuniverse/flake.nix/exp";
 
     ########################  Some non-flake repositories  #########################################
 
diff --git a/hosts/idols_aquamarine/config.dae b/hosts/idols_aquamarine/config.dae
index 39298083..1feddac4 100644
--- a/hosts/idols_aquamarine/config.dae
+++ b/hosts/idols_aquamarine/config.dae
@@ -36,16 +36,11 @@ global {
     # The WAN interface to bind. Use it if you want to proxy localhost.
     # Multiple interfaces split by ",". Use "auto" to auto detect.
     # bypass router has no WAN interface, so comment it.
-    # wan_interface: auto
+    wan_interface: auto
 
     # Automatically configure Linux kernel parameters like ip_forward and send_redirects. Check out
     # https://github.com/daeuniverse/dae/blob/main/docs/en/user-guide/kernel-parameters.md to see what will dae do.
-    auto_config_kernel_parameter: true
-
-    # Automatically configure firewall rules like firewalld and fw4.
-    # firewalld: nft 'insert rule inet firewalld filter_INPUT mark 0x08000000 accept'
-    # fw4: nft 'insert rule inet fw4 input mark 0x08000000 accept'
-    auto_config_firewall_rule: false
+    auto_config_kernel_parameter: false
 
     ##### Node connectivity check.