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;
+				nixpkgs.overlays = overlays;
-				home-manager = {
+				home-manager.extraSpecialArgs = {
-					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";
-				};
 			}
+			hm.darwinModules.home-manager
+			inputs.self.modules.darwinModule
 			./${name}
 		] ++ extraMods;
 	};

flake.nix

@@ -92,6 +92,9 @@
 		}));
 
 		overlays = { default = local_overlay; };
+
+		modules = import ./modules;
+		
 		packages = {
 			x86_64-linux = rec {
 				default = iso;

hosts/default.nix

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

modules/baseline.nix

@@ -0,0 +1,55 @@
+{pkgs, ... }:
+{
+    # Enable flakes
+    nix = {
+        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 = {
+            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
+    ];
+}

modules/darwin/default.nix

@@ -0,0 +1,26 @@
+{...}:
+{
+    imports = [
+        ../baseline.nix
+    ];
+    system.stateVersion = 4;
+    home-manager = {
+        useGlobalPkgs = true;
+        users."gregory.hellings" = import ../../home/home.nix;
+        extraSpecialArgs = {
+            gnome = false;
+            gui = false;
+            home = "/Users/gregory.hellings";
+        };
+    };
+    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?
+    };
+}

modules/default.nix

@@ -1,63 +1,7 @@
-{ pkgs, lib, ... }:
-
 let
+	nixos = (import ./nixos);
+	darwin = (import ./darwin);
 in {
-	imports = [
+	nixosModule = nixos;
-		./linux
+	darwinModule = darwin;
-	];
-
-	# 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
-	];
 }

modules/linux/linux.nix

@@ -1,11 +0,0 @@
-{ config, lib, ... }:
-
-let
-	cfg = config.greg.linux;
-
-in with lib; {
-	options.greg.linux = mkEnableOption "This system is Linux";
-
-	config = mkIf cfg {
-	};
-}

modules/nixos/default.nix

@@ -2,13 +2,13 @@
 
 {
 	imports = [
+		../baseline.nix
 		./backup.nix
 		./gnome.nix
 		./home.nix
 		./kde.nix
 		./kiwix-serve.nix
 		./linode.nix
-		./linux.nix
 		./proxy.nix
 		./router.nix
 		./rpi4.nix
@@ -24,7 +24,10 @@
 
 	system.stateVersion = "22.05";
 
-	nix.gc.dates = "weekly";
+	nix = {
+		gc.dates = "weekly";
+		settings.auto-optimise-store = true;
+	};
 
 	# I am a fan of network manager, myself
 	networking = {