From 597a100bb2b4ce193c582996cf3c39540cb7cfed Mon Sep 17 00:00:00 2001
From: sid <sid@sid.ovh>
Date: Sun, 10 May 2026 15:50:04 +0200
Subject: [PATCH] rebuild: remove dix and nom

---
 apps/rebuild/default.nix |  4 ----
 apps/rebuild/rebuild.sh  | 26 +++++++++++---------------
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/apps/rebuild/default.nix b/apps/rebuild/default.nix
index 72503a3..21242c7 100644
--- a/apps/rebuild/default.nix
+++ b/apps/rebuild/default.nix
@@ -7,8 +7,6 @@
   hostname,
   nix,
   nixos-rebuild-ng,
-  nix-output-monitor,
-  dix,
   ...
 }:
 
@@ -28,7 +26,5 @@ writeShellApplication {
     hostname
     nix
     nixos-rebuild-ng
-    nix-output-monitor
-    dix
   ];
 }
diff --git a/apps/rebuild/rebuild.sh b/apps/rebuild/rebuild.sh
index cb78314..177a35b 100755
--- a/apps/rebuild/rebuild.sh
+++ b/apps/rebuild/rebuild.sh
@@ -48,7 +48,6 @@ Rebuild_nixos() {
 
   # Construct rebuild command
   local CMD=("nixos-rebuild" "switch" "--sudo")
-  [[ -n "$TARGET_HOST" || -n "$BUILD_HOST" ]] && CMD+=("--ask-sudo-password")
   CMD+=("--flake" "$FLAKE")
   [ "$ROLLBACK" = 1 ] && CMD+=("--rollback")
   [ "$SHOW_TRACE" = 1 ] && CMD+=("--show-trace")
@@ -58,6 +57,7 @@ Rebuild_nixos() {
     _status "Using '$TARGET_HOST' as target host."
   fi
   [ -n "$TARGET_HOST" ] && CMD+=("--target-host" "$TARGET_HOST")
+  [[ -n "$TARGET_HOST" || -n "$BUILD_HOST" ]] && CMD+=("--ask-sudo-password")
 
   # Build config first so we can diff it
   local BUILD_CMD=("nixos-rebuild" "build" "--flake" "$FLAKE")
@@ -67,18 +67,16 @@ Rebuild_nixos() {
   if [ "$ROLLBACK" = 0 ]; then
     _status "Building NixOS configuration '$FLAKE'..."
     _status "Executing command: ${BUILD_CMD[*]}"
-    "${BUILD_CMD[@]}" |&nom || error "NixOS build failed"
-    _status "Package diff:"
-    dix /run/current-system result
-    rm result
+    "${BUILD_CMD[@]}" || error "NixOS build failed"
+
+    _status "Switching to new NixOS configuration"
   else
-    _status "Rolling back to last NixOS generation..."
+    _status "Rolling back to last NixOS generation"
   fi
 
-  _status "Switching to new NixOS configuration"
   sudo -v
   _status "Executing command: ${CMD[*]}"
-  "${CMD[@]}" |& nom || error "NixOS rebuild failed"
+  "${CMD[@]}" || error "NixOS rebuild failed"
   success "NixOS rebuild completed successfully."
 }
 
@@ -107,17 +105,15 @@ Rebuild_home() {
     [ "$SHOW_TRACE" = 1 ] && BUILD_CMD+=("--show-trace")
     _status "Building Home Manager configuration '$FLAKE'..."
     _status "Executing command: ${BUILD_CMD[*]}"
-    "${BUILD_CMD[@]}" |& nom || error "Home Manager build failed"
-    _status "Package diff:"
-    dix /run/current-system result
-    rm result
+    "${BUILD_CMD[@]}" || error "Home Manager build failed"
+
+    _status "Switching to new Home Manager configuration"
   else
-    _status "Rolling back to last Home Manager generation..."
+    _status "Rolling back to last Home Manager generation"
   fi
 
-  _status "Switching to new Home Manager configuration"
   _status "Executing command: ${CMD[*]}"
-  "${CMD[@]}" |& nom || error "Home Manager rebuild failed"
+  "${CMD[@]}" || error "Home Manager rebuild failed"
   success "Home Manager rebuild completed successfully."
 }