From 531177500b8999eacf3dd75397ddffcaf0fec1a1 Mon Sep 17 00:00:00 2001
From: Peter Rice <peterrice@fastmail.com>
Date: Thu, 19 Mar 2026 23:40:16 -0400
Subject: [PATCH] nh: install and use in deploy script

---
 modules/cli/core.nix      |  3 ++-
 modules/nixos/deploy.fish | 25 +++++++++++--------------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/modules/cli/core.nix b/modules/cli/core.nix
index ae1a484..1d6ac10 100644
--- a/modules/cli/core.nix
+++ b/modules/cli/core.nix
@@ -5,7 +5,8 @@
       packages = with pkgs; [
         fd
         moor
-        nvd
+        nh
+        dix
         nil
         nix-output-monitor
         duf
diff --git a/modules/nixos/deploy.fish b/modules/nixos/deploy.fish
index 6b58372..e1369e8 100644
--- a/modules/nixos/deploy.fish
+++ b/modules/nixos/deploy.fish
@@ -22,31 +22,28 @@ end
 function _deploy_one -a host
     set host (string replace .$domain '' $host)
     set host_url $host.$domain
-    set args --target-host $host_url
+    set args -e passwordless --diff never $flake
+    set -a args --hostname $host --target-host $host_url
     if set -q _flag_remote
         set -a args --build-host $host_url
     end
 
-    set -a args --no-reexec --sudo --flake $flake#$host
-
-    set -a args (printf $_flag_command; or printf switch)
-
+    set root ~/.local/share/nix/gcroots/$host
     if not set -q _flag_remote; and test -d ~/.local/share/nix/gcroots
-        set result (nix build \
-            $flake#nixosConfigurations.\"$host\".config.system.build.toplevel \
-            --print-out-paths --log-format internal-json --verbose 2>| nom --json)
-        test $pipestatus[1] = 0; or return
+        set -a args --out-link $root
+        test -e $root; and set old_root (realpath $root)
     end
 
-    nixos-rebuild $args --log-format internal-json --verbose 2>| nom --json
-    test $pipestatus[1] = 0; or return
+    set command (printf $_flag_command; or printf switch)
+    nh os $command $args
+    or return
 
     set -q commit
     and jj --color=always bookmark set $host -B -r $commit &>/dev/null
 
-    set -q result
-    and nix-store --realise $result \
-        --add-root ~/.local/share/nix/gcroots/$host &>/dev/null
+    if set -q old_root
+        dix $old_root $root
+    end
 
     set highlight (set_color -o brmagenta)
     set reset (set_color normal)
-- 
2.51.2