From 7dbf67a2d3178440a319778b8c43675827b1948e Mon Sep 17 00:00:00 2001
From: Richie Cahill <Richie@tmmworkshop.com>
Date: Tue, 1 Apr 2025 20:10:49 -0400
Subject: [PATCH] updated then vars names

---
 systems/jeeves/docker/qbitvpn.nix             |  8 ++---
 systems/jeeves/docker/share.nix               |  2 +-
 systems/jeeves/runners/nix_builder.nix        |  8 ++---
 systems/jeeves/services/audiobookshelf.nix    |  4 +--
 .../jeeves/services/cloud_flare_tunnel.nix    |  2 +-
 systems/jeeves/services/duckdns.nix           |  4 +--
 systems/jeeves/services/filebrowser.nix       |  2 +-
 systems/jeeves/services/home_assistant.nix    |  2 +-
 systems/jeeves/services/jellyfin.nix          |  2 +-
 systems/jeeves/services/nix_serve.nix         |  2 +-
 systems/jeeves/services/postgress.nix         |  2 +-
 systems/jeeves/services/systemd.nix           |  2 +-
 systems/jeeves/services/transmission.nix      |  6 ++--
 systems/jeeves/syncthing.nix                  | 22 ++++++------
 systems/jeeves/vars.nix                       | 35 +++++++------------
 15 files changed, 47 insertions(+), 56 deletions(-)

diff --git a/systems/jeeves/docker/qbitvpn.nix b/systems/jeeves/docker/qbitvpn.nix
index 1e6b555..e67baa3 100644
--- a/systems/jeeves/docker/qbitvpn.nix
+++ b/systems/jeeves/docker/qbitvpn.nix
@@ -21,9 +21,9 @@ in
       "8118:8118"
     ];
     volumes = [
-      "${vars.media_docker_configs}/qbitvpn:/config"
-      "${vars.storage_qbitvpn}:/data"
-      "${vars.scratch_qbitvpn}:/data/incomplete"
+      "${vars.docker_configs}/qbitvpn:/config"
+      "${vars.qbitvpn}:/data"
+      "${vars.qbitvpn_scratch}:/data/incomplete"
       "/etc/localtime:/etc/localtime:ro"
     ];
     environment = {
@@ -41,7 +41,7 @@ in
       DELUGE_DAEMON_LOG_LEVEL = "debug";
       DELUGE_WEB_LOG_LEVEL = "debug";
     };
-    environmentFiles = [ "${vars.storage_secrets}/docker/qbitvpn" ];
+    environmentFiles = [ "${vars.secrets}/docker/qbitvpn" ];
     autoStart = true;
   };
 }
diff --git a/systems/jeeves/docker/share.nix b/systems/jeeves/docker/share.nix
index 54faa4e..4ae59c2 100644
--- a/systems/jeeves/docker/share.nix
+++ b/systems/jeeves/docker/share.nix
@@ -7,7 +7,7 @@ in
     ports = [ "8091:80" ];
     volumes = [
       "${../../../common/docker_templates}/file_server/sites/:/etc/apache2/sites-enabled/"
-      "${vars.media_share}:/data"
+      "${vars.share}:/data"
     ];
     extraOptions = [ "--network=web" ];
     autoStart = true;
diff --git a/systems/jeeves/runners/nix_builder.nix b/systems/jeeves/runners/nix_builder.nix
index 53c3d69..ff81f1b 100644
--- a/systems/jeeves/runners/nix_builder.nix
+++ b/systems/jeeves/runners/nix_builder.nix
@@ -28,8 +28,8 @@ in
           mountPoint = "/zfs/media/github-runners/${name}";
           isReadOnly = false;
         };
-        "/secrets".mountPoint = "${vars.storage_secrets}/services/github-runners/${name}";
-        "ssh-keys".mountPoint = "${vars.storage_secrets}/services/github-runners/id_ed25519_github-runners";
+        "/secrets".mountPoint = "${vars.secrets}/services/github-runners/${name}";
+        "ssh-keys".mountPoint = "${vars.secrets}/services/github-runners/id_ed25519_github-runners";
       };
       config =
         {
@@ -65,7 +65,7 @@ in
               Port 629
               User github-runners
               HostName 192.168.95.14
-              IdentityFile ${vars.storage_secrets}/services/github-runners/id_ed25519_github-runners
+              IdentityFile ${vars.secrets}/services/github-runners/id_ed25519_github-runners
               StrictHostKeyChecking no
               UserKnownHostsFile /dev/null
           '';
@@ -75,7 +75,7 @@ in
             workDir = "/zfs/media/github-runners/${name}";
             url = "https://github.com/RichieCahill/dotfiles";
             extraLabels = [ "nixos" ];
-            tokenFile = "${vars.storage_secrets}/services/github-runners/${name}";
+            tokenFile = "${vars.secrets}/services/github-runners/${name}";
             user = "github-runners";
             group = "github-runners";
             extraPackages = with pkgs; [
diff --git a/systems/jeeves/services/audiobookshelf.nix b/systems/jeeves/services/audiobookshelf.nix
index 3875bc3..e75e41c 100644
--- a/systems/jeeves/services/audiobookshelf.nix
+++ b/systems/jeeves/services/audiobookshelf.nix
@@ -5,6 +5,6 @@ in
 {
   services.audiobookshelf.enable = true;
   systemd.services.audiobookshelf.serviceConfig.WorkingDirectory =
-    lib.mkForce "${vars.media_docker_configs}/audiobookshelf";
-  users.users.audiobookshelf.home = lib.mkForce "${vars.media_docker_configs}/audiobookshelf";
+    lib.mkForce "${vars.docker_configs}/audiobookshelf";
+  users.users.audiobookshelf.home = lib.mkForce "${vars.docker_configs}/audiobookshelf";
 }
diff --git a/systems/jeeves/services/cloud_flare_tunnel.nix b/systems/jeeves/services/cloud_flare_tunnel.nix
index 056ecb2..33a7bd6 100644
--- a/systems/jeeves/services/cloud_flare_tunnel.nix
+++ b/systems/jeeves/services/cloud_flare_tunnel.nix
@@ -9,7 +9,7 @@ in
     wantedBy = [ "multi-user.target" ];
     serviceConfig = {
       Type = "simple";
-      EnvironmentFile = "${vars.storage_secrets}/docker/cloud_flare_tunnel";
+      EnvironmentFile = "${vars.secrets}/docker/cloud_flare_tunnel";
       ExecStart = "${pkgs.cloudflared}/bin/cloudflared --no-autoupdate tunnel run";
       Restart = "on-failure";
     };
diff --git a/systems/jeeves/services/duckdns.nix b/systems/jeeves/services/duckdns.nix
index 5aae679..5d2e2fa 100644
--- a/systems/jeeves/services/duckdns.nix
+++ b/systems/jeeves/services/duckdns.nix
@@ -4,7 +4,7 @@ in
 {
   services.duckdns = {
     enable = true;
-    tokenFile = "${vars.storage_secrets}/services/duckdns/token";
-    domainsFile = "${vars.storage_secrets}/services/duckdns/domains";
+    tokenFile = "${vars.secrets}/services/duckdns/token";
+    domainsFile = "${vars.secrets}/services/duckdns/domains";
   };
 }
diff --git a/systems/jeeves/services/filebrowser.nix b/systems/jeeves/services/filebrowser.nix
index 782f524..91cece9 100644
--- a/systems/jeeves/services/filebrowser.nix
+++ b/systems/jeeves/services/filebrowser.nix
@@ -14,7 +14,7 @@ in
       Type = "simple";
       User = "richie";
       Group = "users";
-      ExecStart = "${pkgs.filebrowser}/bin/filebrowser --root=/zfs --address=0.0.0.0 --database=${vars.media_docker_configs}/filebrowser/filebrowser.db";
+      ExecStart = "${pkgs.filebrowser}/bin/filebrowser --root=/zfs --address=0.0.0.0 --database=${vars.docker_configs}/filebrowser/filebrowser.db";
       Restart = "on-failure";
     };
   };
diff --git a/systems/jeeves/services/home_assistant.nix b/systems/jeeves/services/home_assistant.nix
index 6c501d7..53d64b6 100644
--- a/systems/jeeves/services/home_assistant.nix
+++ b/systems/jeeves/services/home_assistant.nix
@@ -14,7 +14,7 @@ in
     home-assistant = {
       enable = true;
       openFirewall = true;
-      configDir = vars.media_home_assistant;
+      configDir = vars.home_assistant;
       config = {
         http = {
           server_port = 8123;
diff --git a/systems/jeeves/services/jellyfin.nix b/systems/jeeves/services/jellyfin.nix
index 63e82f6..1505126 100644
--- a/systems/jeeves/services/jellyfin.nix
+++ b/systems/jeeves/services/jellyfin.nix
@@ -5,6 +5,6 @@ in
   services.jellyfin = {
     enable = true;
     openFirewall = true;
-    dataDir = "${vars.media_services}/jellyfin";
+    dataDir = "${vars.services}/jellyfin";
   };
 }
diff --git a/systems/jeeves/services/nix_serve.nix b/systems/jeeves/services/nix_serve.nix
index 906f104..f4b6313 100644
--- a/systems/jeeves/services/nix_serve.nix
+++ b/systems/jeeves/services/nix_serve.nix
@@ -4,7 +4,7 @@ in
 {
   services.nix-serve = {
     enable = true;
-    secretKeyFile = "${vars.storage_secrets}/services/nix-cache/cache-priv-key.pem";
+    secretKeyFile = "${vars.secrets}/services/nix-cache/cache-priv-key.pem";
     openFirewall = true;
   };
 }
diff --git a/systems/jeeves/services/postgress.nix b/systems/jeeves/services/postgress.nix
index fe0a0cf..ccedb6f 100644
--- a/systems/jeeves/services/postgress.nix
+++ b/systems/jeeves/services/postgress.nix
@@ -10,7 +10,7 @@ in
     package = pkgs.postgresql_17_jit;
     enableTCPIP = true;
     enableJIT = true;
-    dataDir = "${vars.media_database}/postgres";
+    dataDir = "${vars.database}/postgres";
 
     authentication = pkgs.lib.mkOverride 10 ''
 
diff --git a/systems/jeeves/services/systemd.nix b/systems/jeeves/services/systemd.nix
index 76d2378..0107cc7 100644
--- a/systems/jeeves/services/systemd.nix
+++ b/systems/jeeves/services/systemd.nix
@@ -23,7 +23,7 @@ in
         description = "validates startup";
         path = [ pkgs.zfs ];
         serviceConfig = {
-          EnvironmentFile = "${vars.storage_secrets}/services/server-validation";
+          EnvironmentFile = "${vars.secrets}/services/server-validation";
           Type = "oneshot";
           ExecStart = "${inputs.system_tools.packages.x86_64-linux.default}/bin/validate_system --config-file='${./validate_system.toml}'";
         };
diff --git a/systems/jeeves/services/transmission.nix b/systems/jeeves/services/transmission.nix
index bedae52..5e1c12b 100644
--- a/systems/jeeves/services/transmission.nix
+++ b/systems/jeeves/services/transmission.nix
@@ -7,16 +7,16 @@ in
     enable = true;
     package = pkgs.transmission_4;
     webHome = pkgs.flood-for-transmission;
-    home = "${vars.media_services}/transmission";
+    home = "${vars.services}/transmission";
     openPeerPorts = true;
     openRPCPort = true;
     downloadDirPermissions = "770";
     settings = {
       bind-address-ipv4 = "192.168.95.14";
       cache-size-mb = 0;
-      download-dir = "${vars.storage_transmission}/complete";
+      download-dir = "${vars.transmission}/complete";
       download-queue-enabled = false;
-      incomplete-dir = "${vars.scratch_transmission}/incomplete";
+      incomplete-dir = "${vars.transmission_scratch}/incomplete";
       incomplete-dir-enabled = true;
       message-level = 3;
       peer-port = 51413;
diff --git a/systems/jeeves/syncthing.nix b/systems/jeeves/syncthing.nix
index 6dfd475..864c526 100644
--- a/systems/jeeves/syncthing.nix
+++ b/systems/jeeves/syncthing.nix
@@ -20,7 +20,7 @@ in
         };
         "notes" = {
           id = "l62ul-lpweo"; # cspell:disable-line
-          path = vars.media_notes;
+          path = vars.notes;
           devices = [
             "rhapsody-in-green"
             "davids-server"
@@ -29,7 +29,7 @@ in
         };
         "important" = {
           id = "4ckma-gtshs"; # cspell:disable-line
-          path = "${vars.storage_syncthing}/important";
+          path = "${vars.syncthing}/important";
           devices = [
             "bob"
             "rhapsody-in-green"
@@ -39,7 +39,7 @@ in
         };
         "music" = {
           id = "vprc5-3azqc"; # cspell:disable-line
-          path = "${vars.storage_syncthing}/music";
+          path = "${vars.syncthing}/music";
           devices = [
             "bob"
             "rhapsody-in-green"
@@ -50,14 +50,14 @@ in
         };
         "projects" = {
           id = "vyma6-lqqrz"; # cspell:disable-line
-          path = "${vars.storage_syncthing}/projects";
+          path = "${vars.syncthing}/projects";
           devices = [
             "rhapsody-in-green"
           ];
           fsWatcherEnabled = true;
         };
         "rhapsody-in-green_temp" = {
-          path = "${vars.storage_syncthing}/rhapsody-in-green_temp";
+          path = "${vars.syncthing}/rhapsody-in-green_temp";
           devices = [
             "rhapsody-in-green"
           ];
@@ -72,7 +72,7 @@ in
           fsWatcherEnabled = true;
         };
         "backup" = {
-          path = "${vars.storage_syncthing}/backup";
+          path = "${vars.syncthing}/backup";
           devices = [
             "davids-server"
           ];
@@ -81,7 +81,7 @@ in
         #
         "davids-backup1" = {
           id = "8229p-8z3tm"; # cspell:disable-line
-          path = "${vars.storage_syncthing}/davids_backups/1";
+          path = "${vars.syncthing}/davids_backups/1";
           devices = [
             "davids-server"
           ];
@@ -90,7 +90,7 @@ in
         };
         "davids-backup2" = {
           id = "iciw3-dp6ao"; # cspell:disable-line
-          path = "${vars.storage_syncthing}/davids_backups/2";
+          path = "${vars.syncthing}/davids_backups/2";
           devices = [
             "davids-server"
           ];
@@ -99,7 +99,7 @@ in
         };
         "davids-backup3" = {
           id = "9si6m-bnkjb"; # cspell:disable-line
-          path = "${vars.storage_syncthing}/davids_backups/3";
+          path = "${vars.syncthing}/davids_backups/3";
           devices = [
             "davids-server"
           ];
@@ -108,7 +108,7 @@ in
         };
         "davids-backup4" = {
           id = "qjyfy-uupj4"; # cspell:disable-line
-          path = "${vars.storage_syncthing}/davids_backups/4";
+          path = "${vars.syncthing}/davids_backups/4";
           devices = [
             "davids-server"
           ];
@@ -117,7 +117,7 @@ in
         };
         "davids-backup5" = {
           id = "fm4h5-emsu2"; # cspell:disable-line
-          path = "${vars.storage_syncthing}/davids_backups/5";
+          path = "${vars.syncthing}/davids_backups/5";
           devices = [
             "davids-server"
           ];
diff --git a/systems/jeeves/vars.nix b/systems/jeeves/vars.nix
index 5e74002..5ea8d09 100644
--- a/systems/jeeves/vars.nix
+++ b/systems/jeeves/vars.nix
@@ -5,26 +5,17 @@ let
 in
 {
   inherit zfs_media zfs_storage zfs_scratch;
-  # media
-  media_database = "${zfs_media}/database";
-  media_docker = "${zfs_media}/docker";
-  media_docker_configs = "${zfs_media}/docker/configs";
-  media_mirror = "${zfs_media}/mirror";
-  media_share = "${zfs_media}/share";
-  media_services = "${zfs_media}/services";
-  media_notes = "${zfs_media}/notes";
-  media_plex = "${zfs_media}/plex";
-  media_home_assistant = "${zfs_media}/home_assistant";
-  # storage
-  storage_main = "${zfs_storage}/main";
-  storage_photos = "${zfs_storage}/photos";
-  storage_plex = "${zfs_storage}/plex";
-  storage_secrets = "${zfs_storage}/secrets";
-  storage_syncthing = "${zfs_storage}/syncthing";
-  storage_library = "${zfs_storage}/library";
-  storage_qbitvpn = "${zfs_storage}/qbitvpn";
-  storage_transmission = "${zfs_storage}/transmission";
-  # scratch
-  scratch_qbitvpn = "${zfs_scratch}/qbitvpn";
-  scratch_transmission = "${zfs_scratch}/transmission";
+  database = "${zfs_media}/database";
+  docker = "${zfs_media}/docker";
+  docker_configs = "${zfs_media}/docker/configs";
+  home_assistant = "${zfs_media}/home_assistant";
+  notes = "${zfs_media}/notes";
+  qbitvpn = "${zfs_storage}/qbitvpn";
+  qbitvpn_scratch = "${zfs_scratch}/qbitvpn";
+  secrets = "${zfs_storage}/secrets";
+  services = "${zfs_media}/services";
+  share = "${zfs_media}/share";
+  syncthing = "${zfs_storage}/syncthing";
+  transmission = "${zfs_storage}/transmission";
+  transmission_scratch = "${zfs_scratch}/transmission";
 }