Move modules to shared

configuration.nix

@@ -8,8 +8,7 @@
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
-      ./modules-all/
-      ./modules-linux/
+      ./modules/
     ];
 
   # Bootloader.

darwin/default.nix

@@ -31,8 +31,7 @@ let
 				};
 				users.users."gregory.hellings".home = "/Users/gregory.hellings";
 			}
-			../modules-all
-			../modules-darwin
+			../modules
 			./${name}
 		] ++ extraMods;
 	};

flake.nix

@@ -84,9 +84,6 @@
 		}));
 
 		overlays = { default = local_overlay; };
-		modules = (import ./modules-all {}) //
-		          (import ./modules-linux {}) //
-		          (import ./modules-darwin {});
 		packages = (import ./overlays/packages.nix { inherit nixunstable flake-utils; });
 	};
 }

hosts/default.nix

@@ -35,8 +35,7 @@ let
 			}
 			inputs.agenix.nixosModules.default
 			hm.nixosModules.home-manager
-			../modules-all
-			../modules-linux
+			../modules
 			./${name}
 		] ++ extraMods;
 	};

hosts/myself/container-git.nix

@@ -6,8 +6,8 @@
 in {
 	imports = [
 		inputs.agenix.nixosModules.default
-		../../modules-linux/proxy.nix
-		../../modules-linux/tailscale.nix
+		../../modules/linux/proxy.nix
+		../../modules/linux/tailscale.nix
 	];
 
 	age.identityPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
@@ -133,8 +133,16 @@ in {
 	# Do not start nginx until we have tailscaled up and running, so it can bind
 	# to the 100.* addresses
 	systemd.services.nginx = {
-		after = [ "tailscaled.service" ];
-		requires = [ "tailscaled.service" ];
+		after = [
+			"tailscaled.service"
+			"network.target"
+			"network-online.target"
+		];
+		wants = [
+			"tailscaled.service"
+			"network.target"
+			"network-online.target"
+		];
 	};
 	system.stateVersion = "24.05";
 }

hosts/myself/git.nix

@@ -217,5 +217,6 @@ in  {
 	virtualisation = {
 		docker.enable = true;
 		oci-containers.backend = "docker";
+		virtualbox.host.enable = true;
 	};
 }

modules/default.nix

@@ -1,9 +1,14 @@
 { pkgs, lib, ... }:
 
+let
+	inherit (lib.strings) hasSuffix;
+	system = pkgs.system; in
 {
 	imports = [
 		./ci-runner.nix
-	];
+	]
+	++ (if (lib.strings.hasSuffix "darwin" "nope") then [./darwin] else [])
+	++ (if (lib.strings.hasSuffix "linux" "linux") then [./linux] else []);
 
 	# Enable flakes
 	nix = {