From 22bbd5e2b4f5a7980881b145835531dcbffc8ca0 Mon Sep 17 00:00:00 2001
From: alexion <contact@alexion.dev>
Date: Wed, 7 Oct 2026 22:40:00 -0400
Subject: [PATCH] refactor(nixos): centralize VPN controls

---
 configs/nixos/hosts/neogaia/default.nix      | 6 ------
 configs/nixos/modules/network/vpn-client.nix | 5 +++++
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/configs/nixos/hosts/neogaia/default.nix b/configs/nixos/hosts/neogaia/default.nix
index 1cfe0ae..45e7d36 100644
--- a/configs/nixos/hosts/neogaia/default.nix
+++ b/configs/nixos/hosts/neogaia/default.nix
@@ -27,15 +27,9 @@
     peer = {
       publicKey = "sGEkSD+gEdIMXi4PBN3AhwHGc4tWMtcjOIey3s7yb3I=";
       endpoint = "100.0.90.192:51820";
-      allowedIPs = [ "10.23.0.0/16" ];
     };
   };
 
-  registry.shell-shortcut.neogaia = {
-    vpn-on = "sudo systemctl start wireguard-wg-home.target";
-    vpn-off = "sudo systemctl stop 'wireguard-wg-home*.service' wireguard-wg-home.target";
-  };
-
   modules.monorepo.enable = true;
   modules.shell.herdr.enable = true;
   modules.shell.gitea-axi.enable = true;
diff --git a/configs/nixos/modules/network/vpn-client.nix b/configs/nixos/modules/network/vpn-client.nix
index 19d4669..bf44f2f 100644
--- a/configs/nixos/modules/network/vpn-client.nix
+++ b/configs/nixos/modules/network/vpn-client.nix
@@ -82,6 +82,11 @@ in
 
     sops.secrets.${cfg.privateKeySecret}.sopsFile = cfg.sopsFile;
 
+    registry.shell-shortcut.${config.networking.hostName} = {
+      vpn-on = "sudo systemctl start wireguard-${cfg.interface}.target";
+      vpn-off = "sudo systemctl stop 'wireguard-${cfg.interface}*.service' wireguard-${cfg.interface}.target";
+    };
+
     systemd.targets."wireguard-${cfg.interface}" = lib.mkIf (!cfg.autoStart) {
       wantedBy = lib.mkForce [ ];
     };