Finish modularizing nix config

machines/kitchen/configuration.nix

@@ -10,24 +10,6 @@
 			./hardware-configuration.nix
 		];
 
-	# Auto cleanup
-	nix = {
-		package = pkgs.nixUnstable;
-    extraOptions = ''
-      experimental-features = nix-command flakes
-    '';
-		autoOptimiseStore = true;
-		gc = {
-			automatic = true;
-			dates = "weekly";
-			options = "--delete-older-than 30d";
-		};
-	};
-
-	nixpkgs.config = {
-		allowUnfree = true;
-	};
-
 	networking.hostName = "nixos"; # Define your hostname.
 
 	# The global useDHCP flag is deprecated, therefore explicitly set to false here.

machines/loft/configuration.nix

@@ -10,24 +10,6 @@
 			./hardware-configuration.nix
 		];
 
-	# Auto cleanup
-	nix = {
-		package = pkgs.nixUnstable;
-    extraOptions = ''
-      experimental-features = nix-command flakes
-    '';
-		autoOptimiseStore = true;
-		gc = {
-			automatic = true;
-			dates = "weekly";
-			options = "--delete-older-than 30d";
-		};
-	};
-
-	nixpkgs.config = {
-		allowUnfree = true;
-	};
-
 	# Set your time zone.
 	time.timeZone = "America/New_York";
 

modules/nix.nix

@@ -1,8 +1,21 @@
 { pkgs, ... }: 
 {
-   nix.extraOptions = ''
+	nix = {
+		extraOptions = ''
 		experimental-features = flakes nix-command
 		'';
 		# this is required until nix 2.4 is released
-   nix.package = pkgs.nixUnstable;
+		package = pkgs.nixUnstable;
+
+		autoOptimiseStore = true;
+		gc = {
+			automatic = true;
+			dates = "weekly";
+			options = "--delete-older-than 30d";
+		};
+	};
+
+	nixpkgs.config = {
+		allowUnfree = true;
+	};
 }