From 510a026de752471c3c7ffa96f297d2bdc7a3ad3c Mon Sep 17 00:00:00 2001
From: John Lancaster <32917998+jsl12@users.noreply.github.com>
Date: Thu, 16 Apr 2026 22:20:19 -0500
Subject: [PATCH] user@hostname for nhms

---
 modules/nix-tools/rebuild.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/nix-tools/rebuild.nix b/modules/nix-tools/rebuild.nix
index 40331ad..15e0b5d 100644
--- a/modules/nix-tools/rebuild.nix
+++ b/modules/nix-tools/rebuild.nix
@@ -56,9 +56,10 @@
         name = "nhms";
         runtimeInputs = [ coreutils hostname nh ];
         text = ''
+          USERNAME=''${USER:-$(whoami)}
           HOSTNAME=$(hostname -s)
           echo "Switching to the $HOSTNAME home-manager profile"
-          nh home switch ${flakeDir} -c "$HOSTNAME" "$@"
+          nh home switch ${flakeDir} -c "$USERNAME@$HOSTNAME" "$@"
         '';
       };