From 44bc4f15319c32e1d21320be916099e50cc876ed Mon Sep 17 00:00:00 2001
From: Richie Cahill <Richie@tmmworkshop.com>
Date: Sat, 11 May 2024 09:46:55 -0400
Subject: [PATCH] moved syncthing_base.nix

---
 systems/jeeves-jr/configuration.nix                 |  6 +-----
 systems/jeeves/configuration.nix                    | 13 ++++---------
 systems/rhapsody-in-green/configuration.nix         |  8 ++------
 .../richie/global}/syncthing_base.nix               |  0
 4 files changed, 7 insertions(+), 20 deletions(-)
 rename {systems/rhapsody-in-green => users/richie/global}/syncthing_base.nix (100%)

diff --git a/systems/jeeves-jr/configuration.nix b/systems/jeeves-jr/configuration.nix
index 0f39e48..5e4469a 100644
--- a/systems/jeeves-jr/configuration.nix
+++ b/systems/jeeves-jr/configuration.nix
@@ -1,5 +1,6 @@
 { pkgs, ... }:
 {
+  imports = [ ../../users/richie/global/zerotier.nix ];
 
   networking = {
     hostId = "1beb3026";
@@ -54,11 +55,6 @@
       trim.enable = true;
       autoScrub.enable = true;
     };
-
-    zerotierone = {
-      enable = true;
-      joinNetworks = [ "e4da7455b2ae64ca" ];
-    };
   };
 
   system.stateVersion = "23.05";
diff --git a/systems/jeeves/configuration.nix b/systems/jeeves/configuration.nix
index 497d760..9626f5e 100644
--- a/systems/jeeves/configuration.nix
+++ b/systems/jeeves/configuration.nix
@@ -1,6 +1,9 @@
 { pkgs, ... }:
 {
-  imports = [ ../rhapsody-in-green/syncthing_base.nix ];
+  imports = [
+    ../../users/richie/global/syncthing_base.nix
+    ../../users/richie/global/zerotier.nix
+  ];
 
   networking = {
     hostId = "1beb3027";
@@ -110,14 +113,6 @@
       trim.enable = true;
       autoScrub.enable = true;
     };
-
-    zerotierone = {
-      enable = true;
-      joinNetworks = [
-        "e4da7455b2ae64ca"
-        "52b337794f23c1d4"
-      ];
-    };
   };
 
   system.stateVersion = "23.11";
diff --git a/systems/rhapsody-in-green/configuration.nix b/systems/rhapsody-in-green/configuration.nix
index 7c69a5a..8fd5eea 100644
--- a/systems/rhapsody-in-green/configuration.nix
+++ b/systems/rhapsody-in-green/configuration.nix
@@ -1,7 +1,8 @@
 {
   imports = [
     ./hardware.nix
-    ./syncthing_base.nix
+    ../../users/richie/global/syncthing_base.nix
+    ../../users/richie/global/zerotier.nix
   ];
 
   boot = {
@@ -85,11 +86,6 @@
         fsWatcherEnabled = true;
       };
     };
-
-    zerotierone = {
-      enable = true;
-      joinNetworks = [ "e4da7455b2ae64ca" ];
-    };
   };
 
   system.autoUpgrade.enable = false;
diff --git a/systems/rhapsody-in-green/syncthing_base.nix b/users/richie/global/syncthing_base.nix
similarity index 100%
rename from systems/rhapsody-in-green/syncthing_base.nix
rename to users/richie/global/syncthing_base.nix