1 files changed, 13 insertions, 10 deletions
diff --git a/nixos/modules/hosts.nix b/nixos/modules/hosts.nix
index 4b358b8..9affe19 100644
--- a/nixos/modules/hosts.nix
+++ b/nixos/modules/hosts.nix
@@ -19,7 +19,7 @@ in {
         default = true;
         description = "Use my personal static hosts";
       };
-      vpn = staticZoneOption;
+      zd = staticZoneOption;
       wg = staticZoneOption;
       spt = staticZoneOption;
       adm = staticZoneOption;
@@ -28,9 +28,10 @@ in {
 
   config = {
     cynerd.hosts = {
-      vpn = {
-        "lipwig" = "10.8.0.1";
-        "adm-omnia" = "10.8.0.51";
+      zd = {
+        "mox" = "10.8.0.1";
+        # Portable
+        "binky" = "10.8.0.63";
       };
       wg = {
         "lipwig" = "10.8.1.1";
@@ -40,6 +41,7 @@ in {
         # Endpoints
         "spt-omnia" = "10.8.1.50";
         "adm-omnia" = "10.8.1.51";
+        "zd-mox" = "10.8.1.52";
         # Endpoints without routing
         "dean" = "10.8.1.59";
       };
@@ -51,6 +53,7 @@ in {
         # Local
         "mpd" = "10.8.2.51";
         "errol" = "10.8.2.60";
+        "ridcully" = "10.8.2.59";
         "printer" = "10.8.2.90";
         # Portable
         "albert" = "10.8.2.61";
@@ -61,7 +64,6 @@ in {
         "omnia" = "10.8.3.1";
         "omnia2" = "10.8.3.3";
         # Local
-        "ridcully" = "10.8.3.60";
         "3dprint" = "10.8.3.80";
         "mpd" = "10.8.3.51";
         "printer" = "192.168.1.20";
@@ -72,15 +74,16 @@ in {
     };
 
     networking.hosts = mkIf cnf.enable {
-      # VPN
-      "${cnf.vpn.lipwig}" = ["lipwig.vpn"];
-      "${cnf.vpn.adm-omnia}" = ["adm.vpn"];
+      # Zd
+      "${cnf.zd.mox}" = ["mox.zd"];
+      "${cnf.zd.binky}" = ["binky.zd"];
       # Wireguard
       "${cnf.wg.lipwig}" = ["lipwig.wg"];
       "${cnf.wg.binky}" = ["binky.wg"];
       "${cnf.wg.android}" = ["android.wg"];
       "${cnf.wg.spt-omnia}" = ["spt.wg"];
       "${cnf.wg.adm-omnia}" = ["adm.wg"];
+      "${cnf.wg.zd-mox}" = ["zd.wg"];
       "${cnf.wg.dean}" = ["dean" "dean.wg"];
       # Spt
       "${cnf.spt.omnia}" = ["omnia.spt"];
@@ -88,14 +91,14 @@ in {
       "${cnf.spt.mox2}" = ["mox2.spt"];
       "10.8.2.4" = ["mi3g.spt"];
       "${cnf.spt.mpd}" = ["mpd.spt"];
-      "${cnf.spt.errol}" = ["errol" "desktop.spt"];
+      "${cnf.spt.errol}" = ["errol"];
+      "${cnf.spt.ridcully}" = ["ridcully"];
       "${cnf.spt.albert}" = ["albert.spt"];
       "${cnf.spt.binky}" = ["binky.spt"];
       # Adm
       "${cnf.adm.omnia}" = ["omnia.adm"];
       "10.8.3.2" = ["redmi.adm"];
       "${cnf.adm.omnia2}" = ["omnia2.adm"];
-      "${cnf.adm.ridcully}" = ["ridcully" "desktop.adm"];
       "${cnf.adm.albert}" = ["albert.adm"];
       "${cnf.adm.binky}" = ["binky.adm"];
       "${cnf.adm."3dprint"}" = ["3dprint"];