refactor users activation. refactor home manager config to match nixos conf and move tjkeller archetypes to users/timmy. update many of the exising home manager configs to be nicer and better organized. profile archetypes now include homeconfigs which can be enabled per user, and are setup using a new mkProfileArchetype function.

2 files changed, 23 insertions, 18 deletions

diff --git a/hosts/optiplex/configuration.nix b/hosts/optiplex/configuration.nix
index 8a06294..b92b580 100644
--- a/hosts/optiplex/configuration.nix
+++ b/hosts/optiplex/configuration.nix
@@ -1,16 +1,14 @@
-{ config, lib, pkgs, ... }: {
-	imports = [
-		./hardware-configuration.nix
-		../../archetypes/tjkeller
-	];
-
+{ config, lib, pkgs, home-manager, ... }: {
 	# Setup bootloader
 	boot._loader.enable = true;
 
 	# Enable common options
 	_archetypes = {
 		# Use desktop profile
-		profiles.desktop.enable = true;
+		profiles.desktop = {
+			enable = true;
+			home.users.timmy.enable = true;
+		};
 		# Install software
 		collections = {
 			desktop = {
@@ -35,14 +33,13 @@
 				};
 			};
 		};
-		# Setup user
-		users.primary = {
-			enable = true;
-			autologin.enable = true;
-		};
-		tjkeller = {
-			nas.enable = true;
-		};
+	};
+
+	# Enable user timmy
+	_users.timmy = {
+		enable = true;
+		autologin.enable = true;
+		nas.enable = true;
 	};
 
 	# Disable suspend
@@ -69,5 +66,15 @@
 		forceFullCompositionPipeline = true;  # Enables vsync
 	};
 
+	# Configure home
+	home-manager.users.timmy = {
+		gtk._mintTheme = {
+			dark = true;
+			color = "Green";
+			icons.color = "Green";
+		};
+		programs._seasonalwallpaper.wallpapers.download = true;
+	};
+
 	system.stateVersion = "24.11";
 }
diff --git a/hosts/optiplex/home.nix b/hosts/optiplex/home.nix
index d293ae0..38646b1 100644
--- a/hosts/optiplex/home.nix
+++ b/hosts/optiplex/home.nix
@@ -1,6 +1,4 @@
-{ ... }: {
-	imports = [ ../../home-manager ];
-
+{
 	theme.mint.theme.color = "Dark-Green";
 	theme.mint.icons.color = "Green";
 	wallpapers.enable = true;