From ab11bc0334dedbd6e2a82f6a8990666e00f475b3 Mon Sep 17 00:00:00 2001
From: Peter Rice <peterrice@fastmail.com>
Date: Thu, 26 Mar 2026 16:31:22 -0400
Subject: [PATCH] deploy: use dix in update-diff

---
 flake.lock                | 6 +++---
 modules/nixos/deploy.fish | 5 -----
 modules/nixos/deploy.nix  | 1 +
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/flake.lock b/flake.lock
index d42e005..0299584 100644
--- a/flake.lock
+++ b/flake.lock
@@ -855,11 +855,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1773369348,
-        "narHash": "sha256-6UwMEAi6X3oMjKQm51i0+3i10DrsrSdXi/4YgmJxfhE=",
+        "lastModified": 1774517972,
+        "narHash": "sha256-oPIVzGlMmfWuJlRbr87yU3cnV8NxtwTG92GqpQczlkw=",
         "owner": "nix-community",
         "repo": "srvos",
-        "rev": "f3f0277b1dee1bfd058c5b8b98cb25558d95f03f",
+        "rev": "0ddba2fbd72bb60f8b35b7de1ad67590f454d402",
         "type": "github"
       },
       "original": {
diff --git a/modules/nixos/deploy.fish b/modules/nixos/deploy.fish
index e1369e8..27e6ee7 100644
--- a/modules/nixos/deploy.fish
+++ b/modules/nixos/deploy.fish
@@ -31,7 +31,6 @@ function _deploy_one -a host
     set root ~/.local/share/nix/gcroots/$host
     if not set -q _flag_remote; and test -d ~/.local/share/nix/gcroots
         set -a args --out-link $root
-        test -e $root; and set old_root (realpath $root)
     end
 
     set command (printf $_flag_command; or printf switch)
@@ -41,10 +40,6 @@ function _deploy_one -a host
     set -q commit
     and jj --color=always bookmark set $host -B -r $commit &>/dev/null
 
-    if set -q old_root
-        dix $old_root $root
-    end
-
     set highlight (set_color -o brmagenta)
     set reset (set_color normal)
     random (echo -n $host | sum | cut -d' ' -f1)
diff --git a/modules/nixos/deploy.nix b/modules/nixos/deploy.nix
index 1ab1aed..2a4d2a2 100644
--- a/modules/nixos/deploy.nix
+++ b/modules/nixos/deploy.nix
@@ -18,6 +18,7 @@ in
           + builtins.readFile ./deploy.fish
         ))
       ];
+      srvos.update-diff.command = "${pkgs.dix}/bin/dix --color always";
     };
 
   flake.modules.hjem.core.fish.interactiveShellInit = # fish
-- 
2.51.2