From 7f6759ce06972de9282999ed3ddfdd81a0ebbde1 Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Mon, 23 Mar 2026 10:00:49 +0800
Subject: [PATCH] chore: comment out netbird, migrate back to tailscale

---
 hosts/idols-aquamarine/vpn.nix               | 45 +++++++++-----------
 modules/darwin/apps.nix                      |  2 +-
 modules/nixos/desktop/networking/netbird.nix | 16 +++----
 3 files changed, 30 insertions(+), 33 deletions(-)

diff --git a/hosts/idols-aquamarine/vpn.nix b/hosts/idols-aquamarine/vpn.nix
index e7aafff5..1753191e 100644
--- a/hosts/idols-aquamarine/vpn.nix
+++ b/hosts/idols-aquamarine/vpn.nix
@@ -1,28 +1,25 @@
 {
-  # tailscale do not support running multiple clients on the same host,
-  # so we use netbird for homelab instead.
-  #
-  # services.tailscale = {
-  #   enable = true;
-  #   port = 41641;
-  #   interfaceName = "tailscale0";
-  #   # allow the Tailscale UDP port through the firewall
-  #   openFirewall = true;
-  #
-  #   useRoutingFeatures = "server";
-  #   extraSetFlags = [
-  #     # access home network via tailscale
-  #     "--advertise-routes=192.168.5.0/24"
-  #     "--accept-routes=false"
-  #   ];
-  # };
+  services.tailscale = {
+    enable = true;
+    port = 41641;
+    interfaceName = "tailscale0";
+    # allow the Tailscale UDP port through the firewall
+    openFirewall = true;
 
-  services.netbird.useRoutingFeatures = "server";
-  services.netbird.clients.homelab = {
-    port = 51820;
-    name = "homelab";
-    interface = "netbird-homelab";
-    hardened = true;
-    autoStart = true;
+    useRoutingFeatures = "server";
+    extraSetFlags = [
+      # access home network via tailscale
+      "--advertise-routes=192.168.5.0/24"
+      "--accept-routes=false"
+    ];
   };
+
+  # services.netbird.useRoutingFeatures = "server";
+  # services.netbird.clients.homelab = {
+  #   port = 51820;
+  #   name = "homelab";
+  #   interface = "netbird-homelab";
+  #   hardened = true;
+  #   autoStart = true;
+  # };
 }
diff --git a/modules/darwin/apps.nix b/modules/darwin/apps.nix
index 555ebc61..596231cb 100644
--- a/modules/darwin/apps.nix
+++ b/modules/darwin/apps.nix
@@ -168,7 +168,7 @@ in
       "joplin" # note taking app
 
       "tailscale-app" # tailscale macos app (with gui)
-      "netbirdio/tap/netbird-ui" # netbird gui app
+      # "netbirdio/tap/netbird-ui" # netbird gui app
 
       # AI
       "lm-studio"
diff --git a/modules/nixos/desktop/networking/netbird.nix b/modules/nixos/desktop/networking/netbird.nix
index 5c96992a..6f7cd1f5 100644
--- a/modules/nixos/desktop/networking/netbird.nix
+++ b/modules/nixos/desktop/networking/netbird.nix
@@ -27,12 +27,12 @@
 #
 # =============================================================
 {
-  services.netbird.useRoutingFeatures = "client";
-  services.netbird.clients.homelab = {
-    port = 51820;
-    name = "homelab";
-    interface = "netbird-homelab";
-    hardened = true;
-    autoStart = true;
-  };
+  # services.netbird.useRoutingFeatures = "client";
+  # services.netbird.clients.homelab = {
+  #   port = 51820;
+  #   name = "homelab";
+  #   interface = "netbird-homelab";
+  #   hardened = true;
+  #   autoStart = true;
+  # };
 }