moved syncthing_base.nix

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";

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";

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;

systems/rhapsody-in-green/syncthing_base.nix

@@ -1,17 +0,0 @@
-{
-  services.syncthing = {
-    enable = true;
-    user = "richie";
-    overrideDevices = true;
-    overrideFolders = true;
-    dataDir = "/home/richie/Syncthing";
-    configDir = "/home/richie/.config/syncthing";
-    settings = {
-      devices = {
-        phone.id = "LTGPLAE-M4ZDJTM-TZ3DJGY-SLLAVWF-CQDVEVS-RGCS75T-GAPZYK3-KUM6LA5"; # cspell:disable-line
-        jeeves.id = "7YQ4UEW-OPQEBH4-6YKJH4B-ZCE3SAX-5EIK5JL-WJDIWUA-WA2N3D5-MNK6GAV"; # cspell:disable-line
-        rhapsody-in-green.id = "INKUNKN-KILXGL5-2TQ5JTH-ORJOLOM-WYD2PYO-YRDLQIX-3AKZFWT-ZN7OJAE"; # cspell:disable-line
-      };
-    };
-  };
-}