diff --git a/config/wireguard/imac.conf b/config/wireguard/imac/default.conf
similarity index 100%
rename from config/wireguard/imac.conf
rename to config/wireguard/imac/default.conf
diff --git a/config/wireguard/ipad.conf b/config/wireguard/ipad/default.conf
similarity index 100%
rename from config/wireguard/ipad.conf
rename to config/wireguard/ipad/default.conf
diff --git a/config/wireguard/ipad_exit-vps.conf b/config/wireguard/ipad/exit-vps.conf
similarity index 100%
rename from config/wireguard/ipad_exit-vps.conf
rename to config/wireguard/ipad/exit-vps.conf
diff --git a/config/wireguard/iphone.conf b/config/wireguard/iphone/default.conf
similarity index 100%
rename from config/wireguard/iphone.conf
rename to config/wireguard/iphone/default.conf
diff --git a/config/wireguard/iphone_exit-vps.conf b/config/wireguard/iphone/exit-vps.conf
similarity index 100%
rename from config/wireguard/iphone_exit-vps.conf
rename to config/wireguard/iphone/exit-vps.conf
diff --git a/config/wireguard/mba.conf b/config/wireguard/mba/default.conf
similarity index 100%
rename from config/wireguard/mba.conf
rename to config/wireguard/mba/default.conf
diff --git a/hosts/darwin/imac/system.nix b/hosts/darwin/imac/system.nix
index 7ddb717..27b2bcb 100644
--- a/hosts/darwin/imac/system.nix
+++ b/hosts/darwin/imac/system.nix
@@ -9,20 +9,4 @@
   imports = [
     ../system-default.nix
   ];
-
-  # WireGuard LaunchAgent for auto-start
-  launchd.user.agents.wireguard = {
-    serviceConfig = {
-      ProgramArguments = [
-        "/opt/homebrew/bin/wg-quick"
-        "up"
-        "/Users/yanlin/.config/nix/config/wireguard/imac.conf"
-      ];
-      RunAtLoad = true;
-      KeepAlive = false;
-      Label = "com.wireguard.imac";
-      StandardErrorPath = "/tmp/wireguard.err";
-      StandardOutPath = "/tmp/wireguard.out";
-    };
-  };
 }
diff --git a/hosts/darwin/mba/system.nix b/hosts/darwin/mba/system.nix
index a13a6fa..396d64f 100644
--- a/hosts/darwin/mba/system.nix
+++ b/hosts/darwin/mba/system.nix
@@ -9,20 +9,4 @@
   imports = [
     ../system-default.nix
   ];
-
-  # WireGuard LaunchAgent for auto-start
-  launchd.user.agents.wireguard = {
-    serviceConfig = {
-      ProgramArguments = [
-        "/opt/homebrew/bin/wg-quick"
-        "up"
-        "/Users/yanlin/.config/nix/config/wireguard/mba.conf"
-      ];
-      RunAtLoad = true;
-      KeepAlive = false;
-      Label = "com.wireguard.mba";
-      StandardErrorPath = "/tmp/wireguard.err";
-      StandardOutPath = "/tmp/wireguard.out";
-    };
-  };
 }
diff --git a/modules/homebrew.nix b/modules/homebrew.nix
index 5e2d79a..e534346 100644
--- a/modules/homebrew.nix
+++ b/modules/homebrew.nix
@@ -11,8 +11,6 @@
     };
     brews = [
       # Command-line tools go here
-      "wireguard-go"
-      "wireguard-tools"
     ];
     casks = [
       # GUI applications - manually installed apps now managed by Homebrew