From db60b2f1a9fb1f0f0984de11a98a6e1fa067822b Mon Sep 17 00:00:00 2001
From: Richie Cahill <Richie@tmmworkshop.com>
Date: Sun, 8 Dec 2024 18:13:07 -0500
Subject: [PATCH] removed docker.nix from global default.nix

---
 common/global/default.nix              | 1 -
 common/{global => optional}/docker.nix | 0
 systems/bob/default.nix                | 3 ++-
 systems/jeeves/default.nix             | 1 +
 systems/rhapsody-in-green/default.nix  | 1 +
 5 files changed, 4 insertions(+), 2 deletions(-)
 rename common/{global => optional}/docker.nix (100%)

diff --git a/common/global/default.nix b/common/global/default.nix
index ef4032d..5ff59db 100644
--- a/common/global/default.nix
+++ b/common/global/default.nix
@@ -7,7 +7,6 @@
 {
   imports = [
     inputs.home-manager.nixosModules.home-manager
-    ./docker.nix
     ./fail2ban.nix
     ./fonts.nix
     ./libs.nix
diff --git a/common/global/docker.nix b/common/optional/docker.nix
similarity index 100%
rename from common/global/docker.nix
rename to common/optional/docker.nix
diff --git a/systems/bob/default.nix b/systems/bob/default.nix
index e860b7d..c015cc8 100644
--- a/systems/bob/default.nix
+++ b/systems/bob/default.nix
@@ -3,12 +3,13 @@
     ../../users/richie
     ../../common/global
     ../../common/optional/desktop.nix
+    ../../common/optional/docker.nix
     ../../common/optional/scanner.nix
     ../../common/optional/steam.nix
     ../../common/optional/syncthing_base.nix
     ../../common/optional/systemd-boot.nix
-    ../../common/optional/zerotier.nix
     ../../common/optional/yubikey.nix
+    ../../common/optional/zerotier.nix
     ./hardware.nix
     ./nvidia.nix
     ./syncthing.nix
diff --git a/systems/jeeves/default.nix b/systems/jeeves/default.nix
index 3db8e85..6d4b44b 100644
--- a/systems/jeeves/default.nix
+++ b/systems/jeeves/default.nix
@@ -5,6 +5,7 @@ in
   imports = [
     ../../users/richie
     ../../common/global
+    ../../common/optional/docker.nix
     ../../common/optional/ssh_decrypt.nix
     ../../common/optional/syncthing_base.nix
     ../../common/optional/zerotier.nix
diff --git a/systems/rhapsody-in-green/default.nix b/systems/rhapsody-in-green/default.nix
index c8f9998..c39cb1f 100644
--- a/systems/rhapsody-in-green/default.nix
+++ b/systems/rhapsody-in-green/default.nix
@@ -4,6 +4,7 @@
     ../../users/richie
     ../../common/global
     ../../common/optional/desktop.nix
+    ../../common/optional/docker.nix
     ../../common/optional/steam.nix
     ../../common/optional/syncthing_base.nix
     ../../common/optional/systemd-boot.nix