From 677364fe7448949d4f47201551bebae1d07e7f77 Mon Sep 17 00:00:00 2001
From: Richie Cahill <Richie@tmmworkshop.com>
Date: Wed, 26 Aug 2026 13:11:34 -0400
Subject: [PATCH] removed zerotier.nix for common and removed zerotier from all
 systems except jeeves

---
 common/optional/zerotier.nix          | 11 -----------
 systems/bob/default.nix               |  1 -
 systems/brain/default.nix             |  1 -
 systems/jeeves/default.nix            |  9 +++++++--
 systems/rhapsody-in-green/default.nix |  1 -
 5 files changed, 7 insertions(+), 16 deletions(-)
 delete mode 100644 common/optional/zerotier.nix

diff --git a/common/optional/zerotier.nix b/common/optional/zerotier.nix
deleted file mode 100644
index 2e4499a..0000000
--- a/common/optional/zerotier.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  services.zerotierone = {
-    enable = true;
-    joinNetworks = [ "e4da7455b2ae64ca" ];
-  };
-  nix.settings = {
-    trusted-substituters = [ "http://192.168.90.40:5000" ];
-    substituters = [ "http://192.168.90.40:5000/?priority=1&want-mass-query=true" ];
-    trusted-public-keys = [ "cache.tmmworkshop.com:jHffkpgbmEdstQPoihJPYW9TQe6jnQbWR2LqkNGV3iA=" ];
-  };
-}
diff --git a/systems/bob/default.nix b/systems/bob/default.nix
index 5f237cf..638dd2f 100644
--- a/systems/bob/default.nix
+++ b/systems/bob/default.nix
@@ -15,7 +15,6 @@
     "${inputs.self}/common/optional/tailscale.nix"
     "${inputs.self}/common/optional/update.nix"
     "${inputs.self}/common/optional/yubikey.nix"
-    "${inputs.self}/common/optional/zerotier.nix"
     "${inputs.self}/common/optional/zfs"
     ./hardware.nix
     ./syncthing.nix
diff --git a/systems/brain/default.nix b/systems/brain/default.nix
index d63847f..459f2f6 100644
--- a/systems/brain/default.nix
+++ b/systems/brain/default.nix
@@ -9,7 +9,6 @@
     "${inputs.self}/common/optional/systemd-boot.nix"
     "${inputs.self}/common/optional/tailscale.nix"
     "${inputs.self}/common/optional/update.nix"
-    "${inputs.self}/common/optional/zerotier.nix"
     "${inputs.self}/common/optional/zfs"
     ./docker
     ./hardware.nix
diff --git a/systems/jeeves/default.nix b/systems/jeeves/default.nix
index 021288f..9148070 100644
--- a/systems/jeeves/default.nix
+++ b/systems/jeeves/default.nix
@@ -15,7 +15,6 @@ in
     "${inputs.self}/common/optional/syncthing_base.nix"
     "${inputs.self}/common/optional/tailscale.nix"
     "${inputs.self}/common/optional/update.nix"
-    "${inputs.self}/common/optional/zerotier.nix"
     "${inputs.self}/common/optional/zfs"
     ./monitoring
     ./docker
@@ -37,7 +36,13 @@ in
       EnvironmentFile = "${vars.secrets}/services/snapshot_manager";
     };
 
-    zerotierone.joinNetworks = [ "a09acf02330d37b9" ];
+    zerotierone = {
+      enable = true;
+      joinNetworks = [
+        "e4da7455b2ae64ca"
+        "a09acf02330d37b9"
+      ];
+    };
   };
 
   users.groups = {
diff --git a/systems/rhapsody-in-green/default.nix b/systems/rhapsody-in-green/default.nix
index 0e229bb..443860b 100644
--- a/systems/rhapsody-in-green/default.nix
+++ b/systems/rhapsody-in-green/default.nix
@@ -10,7 +10,6 @@
     "${inputs.self}/common/optional/systemd-boot.nix"
     "${inputs.self}/common/optional/tailscale.nix"
     "${inputs.self}/common/optional/yubikey.nix"
-    "${inputs.self}/common/optional/zerotier.nix"
     "${inputs.self}/common/optional/zfs"
     ./hardware.nix
     ./open_webui.nix