More streamlining of modules

modules/default.nix

@@ -1,63 +1,7 @@
-{ pkgs, lib, ... }:
-
 let
+	nixos = (import ./nixos);
+	darwin = (import ./darwin);
 in {
-	imports = [
-		./linux
-	];
-
-	# Enable flakes
-	nix = {
-		package = pkgs.nixFlakes;
-		gc = {
-			automatic = true;
-			# Scheduling of them is different in nixos vs nix-darwin, so check for
-			# the extra details there
-			options = "--delete-older-than 30d";
-		};
-
-		settings = {
-			auto-optimise-store = true;
-			experimental-features = "nix-command flakes";
-			keep-outputs = true;
-			keep-derivations = true;
-			min-free = (toString (1024 * 1024 * 1024) );
-			max-free = (toString (5 * 1024 * 1024 * 1024) );
-			substituters = [
-				"https://cache.garnix.io"
-				"https://ai.cachix.org"
-			];
-			trusted-public-keys = [
-				"cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
-				"ai.cachix.org-1:N9dzRK+alWwoKXQlnn0H6aUx0lU/mspIoz8hMvGvbbc="
-			];
-		};
-	};
-
-	nixpkgs.config = {
-		allowUnfree = true;
-	};
-
-	# Base packages that need to be in all my hosts
-	environment.systemPackages = with pkgs; [
-		agenix
-		android-file-transfer
-		bitwarden-cli
-		configure_aws_creds
-		diffutils
-		git
-		gh
-		gnupatch
-		gregpy
-		findutils
-		hms # My own home manager switcher
-		htop
-		killall
-		nano
-		pciutils
-		pwgen
-		transcrypt
-		unzip
-		wget
-	];
-}
+	nixosModule = nixos;
+	darwinModule = darwin;
+}