1 files changed, 20 insertions, 12 deletions
diff --git a/flake.nix b/flake.nix
index 547d9db..36af18b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,12 +8,10 @@ rec {
 			url = "github:Mic92/sops-nix";
 			inputs.nixpkgs.follows = "nixpkgs";
 		};
-
 		home-manager = {
 			url = "github:nix-community/home-manager/release-24.11";
 			inputs.nixpkgs.follows = "nixpkgs";
 		};
-
 		arkenfox = {
 			url = "github:dwarfmaster/arkenfox-nixos";
 			inputs.nixpkgs.follows = "nixpkgs";
@@ -26,17 +24,21 @@ rec {
 			pkgs = nixpkgs.legacyPackages.${system};
 			userDetails = {
 				username = "timmy";
-				home.root = "/home/timmy";
-				home.downloads = "/home/timmy/dls";
-				home.documents = "/home/timmy/docs";
-				home.pictures = "/home/timmy/pics";
 				email = "tjkeller.xyz";
 				fullname = "Tim Keller";
+				home = with userDetails; with home; {
+					root = "/home/${username}";
+					downloads = "${root}/dls";
+					documents = "${root}/docs";
+					pictures  = "${root}/pics";
+				};
 			};
+			homeStateVersion = "24.05";  # Lowest of systems is fine
 			mkNixosConfiguration = hostname: nixpkgs.lib.nixosSystem {
 				inherit system;
 				specialArgs = {
 					inherit inputs;
+					inherit hostname;
 					inherit userDetails;
 				};
 				modules = [
@@ -50,6 +52,7 @@ rec {
 							users.${userDetails.username} = import ./modules/home;
 							extraSpecialArgs = {
 								inherit userDetails;
+								inherit homeStateVersion;
 							};
 							sharedModules = [
 								inputs.arkenfox.hmModules.arkenfox
@@ -60,11 +63,16 @@ rec {
 				];
 			};
 		in {
-			nixosConfigurations = {
-				T430 = mkNixosConfiguration "T430";
-				T495 = mkNixosConfiguration "T495";
-				hp-envy-office = mkNixosConfiguration "hp-envy-office";
-				optiplex = mkNixosConfiguration "optiplex";
-			};
+			nixosConfigurations = builtins.listToAttrs (map (hostname: {
+				name = hostname;
+				value = mkNixosConfiguration hostname;
+			}) [
+				# Configured system hostnames go here
+				"T430"
+				"T495"
+				"hp-envy-office"
+				"libreX60"
+				"optiplex"
+			]);
 		};
 }