More streamlining of modules

darwin/default.nix

@@ -15,33 +15,15 @@ let
 		inherit system;
 		specialArgs = { inherit nixpkgs; };
 		modules = [
-			{ nixpkgs.overlays = overlays; }
-			hm.darwinModules.home-manager
 			{
-				system.stateVersion = 4;
-				home-manager = {
-					useGlobalPkgs = true;
-					users."gregory.hellings" = import ../home/home.nix;
-					extraSpecialArgs = {
-						inherit inputs;
-						gnome = false;
-						gui = false;
-						home = "/Users/gregory.hellings";
-						host = name;
-					};
-				};
-				users.users."gregory.hellings".home = "/Users/gregory.hellings";
-				programs = {
-					zsh.enable = true;
-					bash.enable = true;
-				};
-				services.nix-daemon.enable = true;
-				nix = {
-					gc.interval.Hour = 24;
-					settings.auto-optimise-store = false;  # Darwin bugs?
-					settings.experimental-features = "nix-command flakes";
+				nixpkgs.overlays = overlays;
+				home-manager.extraSpecialArgs = {
+					inherit inputs;
+					host = name;
 				};
 			}
+			hm.darwinModules.home-manager
+			inputs.self.modules.darwinModule
 			./${name}
 		] ++ extraMods;
 	};