fix(hosts): restore user home-manager wiring and refresh pi-harness deps hash

modules/_darwin/dock.nix

@@ -39,7 +39,7 @@ in {
 								};
 							});
 					default = [
-						{path = "/Applications/Helium.app/";}
+						{path = "/Applications/Safari.app/";}
 						{path = "/Applications/Ghostty.app/";}
 						{path = "/System/Applications/Calendar.app/";}
 						{path = "/System/Applications/Mail.app/";}

modules/_lib/hosts.nix

@@ -1,7 +1,9 @@
 {
 	den,
 	lib,
-}: {
+}: let
+	merge = lib.recursiveUpdate;
+in {
 	mkUserHost = {
 		system,
 		host,
@@ -10,8 +12,9 @@
 		includes ? [],
 		homeManager ? null,
 	}:
+		merge
 		(lib.setAttrByPath ["den" "hosts" system host "users" user "aspect"] userAspect)
-		// (lib.setAttrByPath ["den" "aspects" userAspect] ({inherit includes;}
+		(lib.setAttrByPath ["den" "aspects" userAspect] ({inherit includes;}
 				// lib.optionalAttrs (homeManager != null) {
 					inherit homeManager;
 				}));

modules/_overlays/pi-harness.nix

@@ -12,7 +12,7 @@
 					src = inputs.pi-harness;
 					pnpm = prev.pnpm_10;
 					fetcherVersion = 1;
-					hash = "sha256-NxdWrSNhk+rcvACQoBRPa+bHgLi9vMwCxjH2UySVXEc=";
+					hash = "sha256-l85j3MH/uott+6Cbo9r3w8jojdlikjGf26l4Q1qa43g=";
 				};
 
 			nativeBuildInputs = [

modules/darwin.nix

@@ -151,10 +151,12 @@ in {
 				"alcove"
 				"aqua-voice"
 				"ghostty@tip"
-				"helium-browser"
 				"raycast"
 				"spotify"
 			];
+			masApps = {
+				"Wipr 2" = 1662217862;
+			};
 		};
 	};
 }

modules/desktop.nix

@@ -56,7 +56,7 @@
 					}
 					{
 						"if" = {
-							"app-id" = "net.imput.helium";
+							"app-id" = "com.apple.Safari";
 						};
 						run = "move-node-to-workspace 2";
 					}

modules/hosts/chidi.nix

@@ -8,7 +8,8 @@
 	host = "chidi";
 	hostMeta = local.hosts.chidi;
 in
-	hostLib.mkUserHost {
+	lib.recursiveUpdate
+	(hostLib.mkUserHost {
 			system = hostMeta.system;
 			inherit host;
 			user = local.user.name;
@@ -16,8 +17,8 @@ in
 			homeManager = {...}: {
 				programs.git.settings.user.email = local.user.emails.work;
 			};
-	}
+		})
-	// hostLib.mkPerHostAspect {
+	(hostLib.mkPerHostAspect {
 			inherit host;
 			includes = [
 				den.aspects.host-darwin-base
@@ -31,4 +32,4 @@ in
 					"slack"
 				];
 			};
-	}
+		})

modules/hosts/janet.nix

@@ -8,7 +8,8 @@
 	host = "janet";
 	hostMeta = local.hosts.janet;
 in
-	hostLib.mkUserHost {
+	lib.recursiveUpdate
+	(hostLib.mkUserHost {
 			system = hostMeta.system;
 			inherit host;
 			user = local.user.name;
@@ -16,8 +17,8 @@ in
 				den.aspects.user-darwin-laptop
 				den.aspects.user-personal
 			];
-	}
+		})
-	// hostLib.mkPerHostAspect {
+	(hostLib.mkPerHostAspect {
 			inherit host;
 			includes = [
 				den.aspects.host-darwin-base
@@ -27,4 +28,4 @@ in
 				networking.hostName = host;
 				networking.computerName = host;
 			};
-	}
+		})

modules/hosts/michael.nix

@@ -9,13 +9,14 @@
 	host = "michael";
 	hostMeta = local.hosts.michael;
 in
-	hostLib.mkUserHost {
+	lib.recursiveUpdate
+	(hostLib.mkUserHost {
 			system = hostMeta.system;
 			inherit host;
 			user = local.user.name;
 			includes = [den.aspects.user-minimal];
-	}
+		})
-	// hostLib.mkPerHostAspect {
+	(hostLib.mkPerHostAspect {
 			inherit host;
 			includes = [
 				den.aspects.host-public-server
@@ -31,4 +32,4 @@ in
 
 				networking.hostName = host;
 			};
-	}
+		})

modules/hosts/tahani.nix

@@ -9,7 +9,8 @@
 	host = "tahani";
 	hostMeta = local.hosts.tahani;
 in
-	hostLib.mkUserHost {
+	lib.recursiveUpdate
+	(hostLib.mkUserHost {
 			system = hostMeta.system;
 			inherit host;
 			user = local.user.name;
@@ -30,8 +31,8 @@ in
 					}
 				'';
 			};
-	}
+		})
-	// hostLib.mkPerHostAspect {
+	(hostLib.mkPerHostAspect {
 			inherit host;
 			includes = [
 				den.aspects.host-nixos-base
@@ -71,4 +72,4 @@ in
 					}
 				];
 			};
-	}
+		})