moved common out of systems

systems/bob/default.nix

@@ -1,14 +1,14 @@
 {
   imports = [
     ../../users/richie
-    ../common/global
-    ../common/optional/desktop.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/global
+    ../../common/optional/desktop.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
     ./hardware.nix
     ./nvidia.nix
     ./syncthing.nix

systems/jeeves/arch_mirror.nix

@@ -14,7 +14,7 @@ in
   virtualisation.oci-containers.containers.arch_mirror = {
     image = "ubuntu/apache2:latest";
     volumes = [
-      "${../common/docker_templates}/file_server/sites/:/etc/apache2/sites-enabled/"
+      "${../../common/docker_templates}/file_server/sites/:/etc/apache2/sites-enabled/"
       "${vars.media_mirror}:/data"
     ];
     ports = [ "800:80" ];

systems/jeeves/default.nix

@@ -4,10 +4,10 @@ in
 {
   imports = [
     ../../users/richie
-    ../common/global
-    ../common/optional/ssh_decrypt.nix
-    ../common/optional/syncthing_base.nix
-    ../common/optional/zerotier.nix
+    ../../common/global
+    ../../common/optional/ssh_decrypt.nix
+    ../../common/optional/syncthing_base.nix
+    ../../common/optional/zerotier.nix
     ./arch_mirror.nix
     ./docker
     ./hardware.nix

systems/rhapsody-in-green/default.nix

@@ -2,12 +2,12 @@
 {
   imports = [
     ../../users/richie
-    ../common/global
-    ../common/optional/desktop.nix
-    ../common/optional/syncthing_base.nix
-    ../common/optional/systemd-boot.nix
-    ../common/optional/yubikey.nix
-    ../common/optional/zerotier.nix
+    ../../common/global
+    ../../common/optional/desktop.nix
+    ../../common/optional/syncthing_base.nix
+    ../../common/optional/systemd-boot.nix
+    ../../common/optional/yubikey.nix
+    ../../common/optional/zerotier.nix
     ./hardware.nix
     ./syncthing.nix
     inputs.nixos-hardware.nixosModules.framework-13-7040-amd