2 files changed, 44 insertions, 21 deletions

diff --git a/archetypes/profiles/desktop/default.nix b/archetypes/profiles/desktop/default.nix
index d9a7dc7..7ca1e7c 100644
--- a/archetypes/profiles/desktop/default.nix
+++ b/archetypes/profiles/desktop/default.nix
@@ -1,12 +1,7 @@
 { lib, config, pkgs, ... }: let
 	mkDesktop = lib.mkOverride 920;
-	cfg = config._archetypes.profiles.desktop;
-in {
-	options._archetypes.profiles.desktop = {
-		enable = lib.mkEnableOption "enable desktop profile";
-	};
 
-	config = lib.mkIf cfg.enable {
+	nixosConfig = {
 		_archetypes.collections = {
 			desktop = {
 				utilities.enable = mkDesktop true;
@@ -22,10 +17,6 @@ in {
 			fonts.enable = mkDesktop true;
 		};
 
-		_archetypes.users.primary = {
-			enable = mkDesktop true;
-		};
-
 		security = {
 			_doas.enable = mkDesktop true;
 		};
@@ -45,9 +36,42 @@ in {
 			tlp.enable = mkDesktop true;
 
 			# Ensure video group can change backlight
-			udev.extraRules = ''
+			udev.extraRules = mkDesktop ''
 				SUBSYSTEM=="backlight", ACTION=="add", RUN+="${pkgs.coreutils}/bin/chgrp video /sys/class/backlight/%k/brightness", RUN+="${pkgs.coreutils}/bin/chmod g+w /sys/class/backlight/%k/brightness"
 			'';
 		};
 	};
+
+	homeConfig = {
+		gtk = {
+			enable = mkDesktop true;
+			_mintTheme.enable = mkDesktop true;
+			font.name = mkDesktop "sans-serif";
+			cursorTheme.name = mkDesktop "Adwaita";
+		};
+
+		qt._gtkPlatformTheme.enable = mkDesktop true;
+
+		fonts.fontconfig = {
+			enable = mkDesktop true;
+			defaultFonts = {
+				# These fonts are added above in fonts collection
+				sansSerif = mkDesktop [ "Inter" ];
+				monospace = mkDesktop [ "CommitMono" ];
+			};
+		};
+
+		programs = {
+			_pcmanfm.openAsRootOption.enable = mkDesktop true;
+			firefox._configure = mkDesktop true;
+			htop._configure = mkDesktop true;
+		};
+
+		home._repos = {
+			enable = mkDesktop true;
+			desktop = mkDesktop true;
+		};
+	};
+in {
+	imports = [ (lib._mkProfileArchetype "desktop" nixosConfig homeConfig) ];
 }
diff --git a/archetypes/profiles/headless/default.nix b/archetypes/profiles/headless/default.nix
index ef17db0..b391076 100644
--- a/archetypes/profiles/headless/default.nix
+++ b/archetypes/profiles/headless/default.nix
@@ -1,22 +1,13 @@
 { lib, config, ... }: let
 	mkHeadless = lib.mkOverride 910;
-	cfg = config._archetypes.profiles.headless;
-in {
-	options._archetypes.profiles.headless = {
-		enable = lib.mkEnableOption "enable headless profile";
-	};
 
-	config = lib.mkIf cfg.enable {
+	nixosConfig = {
 		_archetypes.collections = {
 			development = {
 				utilities.enable = mkHeadless true;
 			};
 		};
 
-		_archetypes.users = {
-			primary.enable = mkHeadless true;
-		};
-
 		security = {
 			_doas.enable = mkHeadless true;
 		};
@@ -29,4 +20,12 @@ in {
 			_ssh.enable = mkHeadless true;
 		};
 	};
+
+	homeConfig = {
+		home._repos = {
+			enable = mkHeadless true;
+		};
+	};
+in {
+	imports = [ (lib._mkProfileArchetype "headless" nixosConfig homeConfig) ];
 }