From 018044aa7db0013f689e3bcc13789e8370dd7451 Mon Sep 17 00:00:00 2001
From: xinyangli <lixinyang411@gmail.com>
Date: Mon, 23 Sep 2024 20:17:57 +0800
Subject: [PATCH] dolomite/network: switch to networkd

---
 machines/dolomite/bandwagon.nix | 16 +++++++++++++---
 machines/dolomite/default.nix   | 31 -------------------------------
 machines/dolomite/lightsail.nix |  3 ++-
 3 files changed, 15 insertions(+), 35 deletions(-)

diff --git a/machines/dolomite/bandwagon.nix b/machines/dolomite/bandwagon.nix
index 1284da3..91449c1 100644
--- a/machines/dolomite/bandwagon.nix
+++ b/machines/dolomite/bandwagon.nix
@@ -42,9 +42,19 @@ in
 
     boot.loader.grub.enable = true;
     boot.loader.grub.device = "/dev/sda";
-    networking.useDHCP = false;
-    networking.interfaces.ens18.useDHCP = true;
-    networking.interfaces.ens19.useDHCP = true;
+    networking.useNetworkd = true;
+    systemd.network.networks."10-wan" = {
+      matchConfig.MACAddress = "ens18";
+      networkConfig.DHCP = "ipv4";
+      dhcpV4Config = {
+        UseDNS = false;
+      };
+    };
+    systemd.network.networks."20-lan" = {
+      matchConfig.MACAddress = "ens19";
+      networkConfig.DHCP = "ipv4";
+    };
+    services.resolved.enable = true;
 
     services.sing-box.settings.dns.strategy = "ipv4_only";
   };
diff --git a/machines/dolomite/default.nix b/machines/dolomite/default.nix
index 019867c..0576114 100644
--- a/machines/dolomite/default.nix
+++ b/machines/dolomite/default.nix
@@ -101,29 +101,6 @@ in
       {
         enable = true;
         settings = {
-          dns = {
-            servers = [
-              {
-                tag = "warp";
-                address = "1.1.1.1";
-                detour = "wg-out";
-              }
-              {
-                tag = "directdns";
-                address = "h3://8.8.8.8/dns-query";
-              }
-            ];
-            rules = [
-              {
-                outbound = "wg-out";
-                server = "warp";
-              }
-              {
-                outbound = "direct";
-                server = "directdns";
-              }
-            ];
-          };
           inbounds =
             [
               {
@@ -182,17 +159,9 @@ in
               type = "direct";
               tag = "direct";
             }
-            {
-              type = "dns";
-              tag = "dns-out";
-            }
           ];
           route = {
             rules = [
-              {
-                outbound = "dns-out";
-                protocol = "dns";
-              }
               {
                 inbound = "sg0";
                 outbound = "direct";
diff --git a/machines/dolomite/lightsail.nix b/machines/dolomite/lightsail.nix
index 18afeda..230b23d 100644
--- a/machines/dolomite/lightsail.nix
+++ b/machines/dolomite/lightsail.nix
@@ -103,7 +103,8 @@ in
     environment.systemPackages = [ pkgs.cryptsetup ];
 
     # EC2 has its own NTP server provided by the hypervisor
-    networking.timeServers = [ "169.254.169.123" ];
+    services.timesyncd.enable = true;
+    services.timesyncd.servers = [ "169.254.169.123" ];
 
     # udisks has become too bloated to have in a headless system
     # (e.g. it depends on GTK).