From bf27504a5a4d3b7bedf53768516058bd6e3ad95a Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Thu, 2 Apr 2026 14:14:11 -0400
Subject: [PATCH] Add repair flag to build scripts.

---
 nix/configuration/hosts/family_disks/DEPLOY_BOOT      | 2 +-
 nix/configuration/hosts/family_disks/DEPLOY_SWITCH    | 2 +-
 nix/configuration/hosts/family_disks/ISO              | 2 +-
 nix/configuration/hosts/family_disks/SELF_BOOT        | 2 +-
 nix/configuration/hosts/family_disks/SELF_BUILD       | 2 +-
 nix/configuration/hosts/family_disks/SELF_SWITCH      | 2 +-
 nix/configuration/hosts/hydra/DEPLOY_BOOT             | 2 +-
 nix/configuration/hosts/hydra/DEPLOY_SWITCH           | 2 +-
 nix/configuration/hosts/hydra/ISO                     | 2 +-
 nix/configuration/hosts/hydra/SELF_BOOT               | 2 +-
 nix/configuration/hosts/hydra/SELF_BUILD              | 2 +-
 nix/configuration/hosts/hydra/SELF_SWITCH             | 2 +-
 nix/configuration/hosts/hydra/VM_ISO                  | 2 +-
 nix/configuration/hosts/i_only_boot_zfs/DEPLOY_BOOT   | 2 +-
 nix/configuration/hosts/i_only_boot_zfs/DEPLOY_SWITCH | 2 +-
 nix/configuration/hosts/i_only_boot_zfs/ISO           | 2 +-
 nix/configuration/hosts/i_only_boot_zfs/SELF_BOOT     | 2 +-
 nix/configuration/hosts/i_only_boot_zfs/SELF_BUILD    | 2 +-
 nix/configuration/hosts/i_only_boot_zfs/SELF_SWITCH   | 2 +-
 nix/configuration/hosts/neelix/DEPLOY_BOOT            | 2 +-
 nix/configuration/hosts/neelix/DEPLOY_SWITCH          | 2 +-
 nix/configuration/hosts/odo/DEPLOY_BOOT               | 2 +-
 nix/configuration/hosts/odo/DEPLOY_SWITCH             | 2 +-
 nix/configuration/hosts/odo/ISO                       | 2 +-
 nix/configuration/hosts/odo/SELF_BOOT                 | 2 +-
 nix/configuration/hosts/odo/SELF_BUILD                | 2 +-
 nix/configuration/hosts/odo/SELF_SWITCH               | 2 +-
 nix/configuration/hosts/odowork/DEPLOY_BOOT           | 2 +-
 nix/configuration/hosts/odowork/DEPLOY_SWITCH         | 2 +-
 nix/configuration/hosts/odowork/INSTALLER             | 2 +-
 nix/configuration/hosts/odowork/ISO                   | 2 +-
 nix/configuration/hosts/odowork/SELF_BOOT             | 2 +-
 nix/configuration/hosts/odowork/SELF_BUILD            | 2 +-
 nix/configuration/hosts/odowork/SELF_SWITCH           | 2 +-
 nix/configuration/hosts/quark/DEPLOY_BOOT             | 2 +-
 nix/configuration/hosts/quark/DEPLOY_SWITCH           | 2 +-
 nix/configuration/hosts/quark/ISO                     | 2 +-
 nix/configuration/hosts/quark/SELF_BOOT               | 2 +-
 nix/configuration/hosts/quark/SELF_BUILD              | 2 +-
 nix/configuration/hosts/quark/SELF_SWITCH             | 2 +-
 nix/configuration/hosts/recovery/DEPLOY_BOOT          | 2 +-
 nix/configuration/hosts/recovery/DEPLOY_SWITCH        | 2 +-
 nix/configuration/hosts/recovery/ISO                  | 2 +-
 nix/configuration/hosts/recovery/SELF_BOOT            | 2 +-
 nix/configuration/hosts/recovery/SELF_BUILD           | 2 +-
 nix/configuration/hosts/recovery/SELF_SWITCH          | 2 +-
 46 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/nix/configuration/hosts/family_disks/DEPLOY_BOOT b/nix/configuration/hosts/family_disks/DEPLOY_BOOT
index c9a277d8..22838aef 100755
--- a/nix/configuration/hosts/family_disks/DEPLOY_BOOT
+++ b/nix/configuration/hosts/family_disks/DEPLOY_BOOT
@@ -10,4 +10,4 @@ TARGET=family_disks
 
 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
 
-nixos-rebuild boot --flake "$DIR/../../#family_disks" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild boot --flake "$DIR/../../#family_disks" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --repair --log-format internal-json -v "${@}" |& nom --json
diff --git a/nix/configuration/hosts/family_disks/DEPLOY_SWITCH b/nix/configuration/hosts/family_disks/DEPLOY_SWITCH
index 1127ca93..d49fbe5b 100755
--- a/nix/configuration/hosts/family_disks/DEPLOY_SWITCH
+++ b/nix/configuration/hosts/family_disks/DEPLOY_SWITCH
@@ -10,4 +10,4 @@ TARGET=family_disks
 
 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
 
-nixos-rebuild switch --flake "$DIR/../../#family_disks" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild switch --flake "$DIR/../../#family_disks" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --repair --log-format internal-json -v "${@}" |& nom --json
diff --git a/nix/configuration/hosts/family_disks/ISO b/nix/configuration/hosts/family_disks/ISO
index 9b32e0ca..675f9016 100755
--- a/nix/configuration/hosts/family_disks/ISO
+++ b/nix/configuration/hosts/family_disks/ISO
@@ -7,4 +7,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 : "${JOBS:="1"}"
 
 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#family_disks.iso" --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json
+nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#family_disks.iso" --repair --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json
diff --git a/nix/configuration/hosts/family_disks/SELF_BOOT b/nix/configuration/hosts/family_disks/SELF_BOOT
index e1213f7b..43c670c8 100755
--- a/nix/configuration/hosts/family_disks/SELF_BOOT
+++ b/nix/configuration/hosts/family_disks/SELF_BOOT
@@ -7,4 +7,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 : "${JOBS:="1"}"
 
 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nixos-rebuild boot --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#family_disks" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild boot --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#family_disks" --repair --log-format internal-json -v "${@}" |& nom --json
diff --git a/nix/configuration/hosts/family_disks/SELF_BUILD b/nix/configuration/hosts/family_disks/SELF_BUILD
index e7c691b7..063b842f 100755
--- a/nix/configuration/hosts/family_disks/SELF_BUILD
+++ b/nix/configuration/hosts/family_disks/SELF_BUILD
@@ -9,4 +9,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
 
-nixos-rebuild build --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#family_disks" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild build --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#family_disks" --repair --log-format internal-json -v "${@}" |& nom --json
diff --git a/nix/configuration/hosts/family_disks/SELF_SWITCH b/nix/configuration/hosts/family_disks/SELF_SWITCH
index ce665404..29ba6228 100755
--- a/nix/configuration/hosts/family_disks/SELF_SWITCH
+++ b/nix/configuration/hosts/family_disks/SELF_SWITCH
@@ -7,4 +7,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 : "${JOBS:="1"}"
 
 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nixos-rebuild switch --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#family_disks" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild switch --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#family_disks" --repair --log-format internal-json -v "${@}" |& nom --json
diff --git a/nix/configuration/hosts/hydra/DEPLOY_BOOT b/nix/configuration/hosts/hydra/DEPLOY_BOOT
index 05aa605e..ef5538c1 100755
--- a/nix/configuration/hosts/hydra/DEPLOY_BOOT
+++ b/nix/configuration/hosts/hydra/DEPLOY_BOOT
@@ -10,4 +10,4 @@ TARGET=hydra
 
 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
 
-nixos-rebuild boot --flake "$DIR/../../#hydra" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild boot --flake "$DIR/../../#hydra" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --repair --log-format internal-json -v "${@}" |& nom --json
diff --git a/nix/configuration/hosts/hydra/DEPLOY_SWITCH b/nix/configuration/hosts/hydra/DEPLOY_SWITCH
index 379103dc..45765f05 100755
--- a/nix/configuration/hosts/hydra/DEPLOY_SWITCH
+++ b/nix/configuration/hosts/hydra/DEPLOY_SWITCH
@@ -10,4 +10,4 @@ TARGET=hydra
 
 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
 
-nixos-rebuild switch --flake "$DIR/../../#hydra" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild switch --flake "$DIR/../../#hydra" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --repair --log-format internal-json -v "${@}" |& nom --json
diff --git a/nix/configuration/hosts/hydra/ISO b/nix/configuration/hosts/hydra/ISO
index b9afe0ab..02e8d822 100755
--- a/nix/configuration/hosts/hydra/ISO
+++ b/nix/configuration/hosts/hydra/ISO
@@ -7,4 +7,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 : "${JOBS:="1"}"
 
 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#hydra.iso" --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json
+nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#hydra.iso" --max-jobs "$JOBS" --repair --log-format internal-json -v "${@}" |& nom --json
diff --git a/nix/configuration/hosts/hydra/SELF_BOOT b/nix/configuration/hosts/hydra/SELF_BOOT
index b095e35a..247f4472 100755
--- a/nix/configuration/hosts/hydra/SELF_BOOT
+++ b/nix/configuration/hosts/hydra/SELF_BOOT
@@ -7,4 +7,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 : "${JOBS:="1"}"
 
 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nixos-rebuild boot --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#hydra" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild boot --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#hydra" --repair --log-format internal-json -v "${@}" |& nom --json
diff --git a/nix/configuration/hosts/hydra/SELF_BUILD b/nix/configuration/hosts/hydra/SELF_BUILD
index 1a0007b3..ab174627 100755
--- a/nix/configuration/hosts/hydra/SELF_BUILD
+++ b/nix/configuration/hosts/hydra/SELF_BUILD
@@ -7,4 +7,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 : "${JOBS:="1"}"
 
 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nixos-rebuild build --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#hydra" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild build --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#hydra" --repair --log-format internal-json -v "${@}" |& nom --json
diff --git a/nix/configuration/hosts/hydra/SELF_SWITCH b/nix/configuration/hosts/hydra/SELF_SWITCH
index f0e2f7fd..1dae2334 100755
--- a/nix/configuration/hosts/hydra/SELF_SWITCH
+++ b/nix/configuration/hosts/hydra/SELF_SWITCH
@@ -7,4 +7,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 : "${JOBS:="1"}"
 
 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nixos-rebuild switch --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#hydra" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild switch --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#hydra" --repair --log-format internal-json -v "${@}" |& nom --json
diff --git a/nix/configuration/hosts/hydra/VM_ISO b/nix/configuration/hosts/hydra/VM_ISO
index 17175ffc..8110ba0c 100755
--- a/nix/configuration/hosts/hydra/VM_ISO
+++ b/nix/configuration/hosts/hydra/VM_ISO
@@ -7,4 +7,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 : "${JOBS:="1"}"
 
 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#hydra.vm_iso" --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json
+nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#hydra.vm_iso" --max-jobs "$JOBS" --repair --log-format internal-json -v "${@}" |& nom --json
diff --git a/nix/configuration/hosts/i_only_boot_zfs/DEPLOY_BOOT b/nix/configuration/hosts/i_only_boot_zfs/DEPLOY_BOOT
index 915b19b8..8fd2c47b 100755
--- a/nix/configuration/hosts/i_only_boot_zfs/DEPLOY_BOOT
+++ b/nix/configuration/hosts/i_only_boot_zfs/DEPLOY_BOOT
@@ -10,4 +10,4 @@ TARGET=i_only_boot_zfs
 
 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
 
-nixos-rebuild boot --flake "$DIR/../../#i_only_boot_zfs" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild boot --flake "$DIR/../../#i_only_boot_zfs" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --repair --log-format internal-json -v "${@}" |& nom --json
diff --git a/nix/configuration/hosts/i_only_boot_zfs/DEPLOY_SWITCH b/nix/configuration/hosts/i_only_boot_zfs/DEPLOY_SWITCH
index 29cf9901..b7e799c2 100755
--- a/nix/configuration/hosts/i_only_boot_zfs/DEPLOY_SWITCH
+++ b/nix/configuration/hosts/i_only_boot_zfs/DEPLOY_SWITCH
@@ -10,4 +10,4 @@ TARGET=i_only_boot_zfs
 
 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
 
-nixos-rebuild switch --flake "$DIR/../../#i_only_boot_zfs" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild switch --flake "$DIR/../../#i_only_boot_zfs" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --repair --log-format internal-json -v "${@}" |& nom --json
diff --git a/nix/configuration/hosts/i_only_boot_zfs/ISO b/nix/configuration/hosts/i_only_boot_zfs/ISO
index 6ca5b92a..9eea704b 100755
--- a/nix/configuration/hosts/i_only_boot_zfs/ISO
+++ b/nix/configuration/hosts/i_only_boot_zfs/ISO
@@ -7,4 +7,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 : "${JOBS:="1"}"
 
 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#i_only_boot_zfs.iso" --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json
+nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#i_only_boot_zfs.iso" --repair --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json
diff --git a/nix/configuration/hosts/i_only_boot_zfs/SELF_BOOT b/nix/configuration/hosts/i_only_boot_zfs/SELF_BOOT
index b976f8d4..822d3989 100755
--- a/nix/configuration/hosts/i_only_boot_zfs/SELF_BOOT
+++ b/nix/configuration/hosts/i_only_boot_zfs/SELF_BOOT
@@ -7,4 +7,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 : "${JOBS:="1"}"
 
 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nixos-rebuild boot --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#i_only_boot_zfs" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild boot --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#i_only_boot_zfs" --repair --log-format internal-json -v "${@}" |& nom --json
diff --git a/nix/configuration/hosts/i_only_boot_zfs/SELF_BUILD b/nix/configuration/hosts/i_only_boot_zfs/SELF_BUILD
index cc10bfef..0ce2ac35 100755
--- a/nix/configuration/hosts/i_only_boot_zfs/SELF_BUILD
+++ b/nix/configuration/hosts/i_only_boot_zfs/SELF_BUILD
@@ -7,4 +7,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 : "${JOBS:="1"}"
 
 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nixos-rebuild build --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#i_only_boot_zfs" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild build --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#i_only_boot_zfs" --repair --log-format internal-json -v "${@}" |& nom --json
diff --git a/nix/configuration/hosts/i_only_boot_zfs/SELF_SWITCH b/nix/configuration/hosts/i_only_boot_zfs/SELF_SWITCH
index 1915408d..e5518675 100755
--- a/nix/configuration/hosts/i_only_boot_zfs/SELF_SWITCH
+++ b/nix/configuration/hosts/i_only_boot_zfs/SELF_SWITCH
@@ -7,4 +7,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 : "${JOBS:="1"}"
 
 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nixos-rebuild switch --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#i_only_boot_zfs" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild switch --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#i_only_boot_zfs" --repair --log-format internal-json -v "${@}" |& nom --json
diff --git a/nix/configuration/hosts/neelix/DEPLOY_BOOT b/nix/configuration/hosts/neelix/DEPLOY_BOOT
index 7353437c..35f579dc 100755
--- a/nix/configuration/hosts/neelix/DEPLOY_BOOT
+++ b/nix/configuration/hosts/neelix/DEPLOY_BOOT
@@ -12,6 +12,6 @@ TARGET=neelix
 
 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
 
-nixos-rebuild boot --flake "$DIR/../../#neelix" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild boot --flake "$DIR/../../#neelix" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --repair --log-format internal-json -v "${@}" |& nom --json
 
 # rsync -av --progress --delete --exclude=.git "$DIR/../../../configuration" "talexander@${TARGET}:/persist/manual/" && ssh talexander@${TARGET} 'cd /persist/manual/configuration && nix flake update zsh-histdb && nix flake update ansible-sshjail && doas nice -n 19 nixos-rebuild boot --flake /persist/manual/configuration#neelix'
diff --git a/nix/configuration/hosts/neelix/DEPLOY_SWITCH b/nix/configuration/hosts/neelix/DEPLOY_SWITCH
index 0aed1415..47ffdbef 100755
--- a/nix/configuration/hosts/neelix/DEPLOY_SWITCH
+++ b/nix/configuration/hosts/neelix/DEPLOY_SWITCH
@@ -12,6 +12,6 @@ TARGET=neelix
 
 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
 
-nixos-rebuild switch --flake "$DIR/../../#neelix" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild switch --flake "$DIR/../../#neelix" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --repair --log-format internal-json -v "${@}" |& nom --json
 
 # rsync -av --progress --delete --exclude=.git "$DIR/../../../configuration" "talexander@${TARGET}:/persist/manual/" && ssh talexander@${TARGET} 'cd /persist/manual/configuration && nix flake update zsh-histdb && nix flake update ansible-sshjail && doas nice -n 19 nixos-rebuild switch --flake /persist/manual/configuration#neelix'
diff --git a/nix/configuration/hosts/odo/DEPLOY_BOOT b/nix/configuration/hosts/odo/DEPLOY_BOOT
index 1de14e39..e5177081 100755
--- a/nix/configuration/hosts/odo/DEPLOY_BOOT
+++ b/nix/configuration/hosts/odo/DEPLOY_BOOT
@@ -10,4 +10,4 @@ TARGET=odo
 
 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
 
-nixos-rebuild boot --flake "$DIR/../../#odo" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild boot --flake "$DIR/../../#odo" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --repair --log-format internal-json -v "${@}" |& nom --json
diff --git a/nix/configuration/hosts/odo/DEPLOY_SWITCH b/nix/configuration/hosts/odo/DEPLOY_SWITCH
index 6fe6d7ab..c973dd56 100755
--- a/nix/configuration/hosts/odo/DEPLOY_SWITCH
+++ b/nix/configuration/hosts/odo/DEPLOY_SWITCH
@@ -10,4 +10,4 @@ TARGET=odo
 
 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
 
-nixos-rebuild switch --flake "$DIR/../../#odo" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild switch --flake "$DIR/../../#odo" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --repair --log-format internal-json -v "${@}" |& nom --json
diff --git a/nix/configuration/hosts/odo/ISO b/nix/configuration/hosts/odo/ISO
index 50f216d6..2c36847e 100755
--- a/nix/configuration/hosts/odo/ISO
+++ b/nix/configuration/hosts/odo/ISO
@@ -7,4 +7,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 : "${JOBS:="1"}"
 
 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#odo.iso" --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json
+nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#odo.iso" --max-jobs "$JOBS" --repair --log-format internal-json -v "${@}" |& nom --json
diff --git a/nix/configuration/hosts/odo/SELF_BOOT b/nix/configuration/hosts/odo/SELF_BOOT
index ff6c55c3..a81492b7 100755
--- a/nix/configuration/hosts/odo/SELF_BOOT
+++ b/nix/configuration/hosts/odo/SELF_BOOT
@@ -7,4 +7,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 : "${JOBS:="1"}"
 
 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nixos-rebuild boot --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#odo" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild boot --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#odo" --repair --log-format internal-json -v "${@}" |& nom --json
diff --git a/nix/configuration/hosts/odo/SELF_BUILD b/nix/configuration/hosts/odo/SELF_BUILD
index 21c8f048..9ab3c5df 100755
--- a/nix/configuration/hosts/odo/SELF_BUILD
+++ b/nix/configuration/hosts/odo/SELF_BUILD
@@ -9,4 +9,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
 
-nixos-rebuild build --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#odo" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild build --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#odo" --repair --log-format internal-json -v "${@}" |& nom --json
diff --git a/nix/configuration/hosts/odo/SELF_SWITCH b/nix/configuration/hosts/odo/SELF_SWITCH
index 0f1423f7..a6d22860 100755
--- a/nix/configuration/hosts/odo/SELF_SWITCH
+++ b/nix/configuration/hosts/odo/SELF_SWITCH
@@ -7,4 +7,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 : "${JOBS:="1"}"
 
 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nixos-rebuild switch --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#odo" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild switch --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#odo" --repair --log-format internal-json -v "${@}" |& nom --json
diff --git a/nix/configuration/hosts/odowork/DEPLOY_BOOT b/nix/configuration/hosts/odowork/DEPLOY_BOOT
index 5de1f2fc..f7f3ac7a 100755
--- a/nix/configuration/hosts/odowork/DEPLOY_BOOT
+++ b/nix/configuration/hosts/odowork/DEPLOY_BOOT
@@ -8,4 +8,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 TARGET=odowork
 
-nixos-rebuild boot --flake "$DIR/../../#odowork" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild boot --flake "$DIR/../../#odowork" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --repair --log-format internal-json -v "${@}" |& nom --json
diff --git a/nix/configuration/hosts/odowork/DEPLOY_SWITCH b/nix/configuration/hosts/odowork/DEPLOY_SWITCH
index 232b8b48..f1065c98 100755
--- a/nix/configuration/hosts/odowork/DEPLOY_SWITCH
+++ b/nix/configuration/hosts/odowork/DEPLOY_SWITCH
@@ -8,4 +8,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 TARGET=odowork
 
-nixos-rebuild switch --flake "$DIR/../../#odowork" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild switch --flake "$DIR/../../#odowork" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --repair --log-format internal-json -v "${@}" |& nom --json
diff --git a/nix/configuration/hosts/odowork/INSTALLER b/nix/configuration/hosts/odowork/INSTALLER
index 2dd62df6..06ee4a7e 100755
--- a/nix/configuration/hosts/odowork/INSTALLER
+++ b/nix/configuration/hosts/odowork/INSTALLER
@@ -6,4 +6,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 : "${JOBS:="1"}"
 
-nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#odowork.installer" --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json
+nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#odowork.installer" --repair --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json
diff --git a/nix/configuration/hosts/odowork/ISO b/nix/configuration/hosts/odowork/ISO
index 581a575b..4ad30134 100755
--- a/nix/configuration/hosts/odowork/ISO
+++ b/nix/configuration/hosts/odowork/ISO
@@ -6,4 +6,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 : "${JOBS:="1"}"
 
-nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#odowork.iso" --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json
+nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#odowork.iso" --max-jobs "$JOBS" --repair --log-format internal-json -v "${@}" |& nom --json
diff --git a/nix/configuration/hosts/odowork/SELF_BOOT b/nix/configuration/hosts/odowork/SELF_BOOT
index 55d395e0..b4ee8689 100755
--- a/nix/configuration/hosts/odowork/SELF_BOOT
+++ b/nix/configuration/hosts/odowork/SELF_BOOT
@@ -6,4 +6,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 : "${JOBS:="1"}"
 
-nixos-rebuild boot --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#odowork" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild boot --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#odowork" --repair --log-format internal-json -v "${@}" |& nom --json
diff --git a/nix/configuration/hosts/odowork/SELF_BUILD b/nix/configuration/hosts/odowork/SELF_BUILD
index a06c4988..69e54916 100755
--- a/nix/configuration/hosts/odowork/SELF_BUILD
+++ b/nix/configuration/hosts/odowork/SELF_BUILD
@@ -6,4 +6,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 : "${JOBS:="1"}"
 
-nixos-rebuild build --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#odowork" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild build --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#odowork" --repair --log-format internal-json -v "${@}" |& nom --json
diff --git a/nix/configuration/hosts/odowork/SELF_SWITCH b/nix/configuration/hosts/odowork/SELF_SWITCH
index 84a1825d..5ddfba3b 100755
--- a/nix/configuration/hosts/odowork/SELF_SWITCH
+++ b/nix/configuration/hosts/odowork/SELF_SWITCH
@@ -6,4 +6,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 : "${JOBS:="1"}"
 
-nixos-rebuild switch --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#odowork" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild switch --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#odowork" --repair --log-format internal-json -v "${@}" |& nom --json
diff --git a/nix/configuration/hosts/quark/DEPLOY_BOOT b/nix/configuration/hosts/quark/DEPLOY_BOOT
index 4e59f16f..506d9762 100755
--- a/nix/configuration/hosts/quark/DEPLOY_BOOT
+++ b/nix/configuration/hosts/quark/DEPLOY_BOOT
@@ -10,4 +10,4 @@ TARGET=quark
 
 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
 
-nixos-rebuild boot --flake "$DIR/../../#quark" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild boot --flake "$DIR/../../#quark" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --repair --log-format internal-json -v "${@}" |& nom --json
diff --git a/nix/configuration/hosts/quark/DEPLOY_SWITCH b/nix/configuration/hosts/quark/DEPLOY_SWITCH
index dbabca47..52a0a182 100755
--- a/nix/configuration/hosts/quark/DEPLOY_SWITCH
+++ b/nix/configuration/hosts/quark/DEPLOY_SWITCH
@@ -10,4 +10,4 @@ TARGET=quark
 
 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
 
-nixos-rebuild switch --flake "$DIR/../../#quark" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild switch --flake "$DIR/../../#quark" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --repair --log-format internal-json -v "${@}" |& nom --json
diff --git a/nix/configuration/hosts/quark/ISO b/nix/configuration/hosts/quark/ISO
index da8f353a..a5b64747 100755
--- a/nix/configuration/hosts/quark/ISO
+++ b/nix/configuration/hosts/quark/ISO
@@ -7,4 +7,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 : "${JOBS:="1"}"
 
 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#quark.iso" --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json
+nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#quark.iso" --max-jobs "$JOBS" --repair --log-format internal-json -v "${@}" |& nom --json
diff --git a/nix/configuration/hosts/quark/SELF_BOOT b/nix/configuration/hosts/quark/SELF_BOOT
index 03870138..a0be2bea 100755
--- a/nix/configuration/hosts/quark/SELF_BOOT
+++ b/nix/configuration/hosts/quark/SELF_BOOT
@@ -7,4 +7,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 : "${JOBS:="1"}"
 
 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nixos-rebuild boot --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#quark" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild boot --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#quark" --repair --log-format internal-json -v "${@}" |& nom --json
diff --git a/nix/configuration/hosts/quark/SELF_BUILD b/nix/configuration/hosts/quark/SELF_BUILD
index 6966a6b1..74843619 100755
--- a/nix/configuration/hosts/quark/SELF_BUILD
+++ b/nix/configuration/hosts/quark/SELF_BUILD
@@ -7,4 +7,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 : "${JOBS:="1"}"
 
 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nixos-rebuild build --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#quark" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild build --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#quark" --repair --log-format internal-json -v "${@}" |& nom --json
diff --git a/nix/configuration/hosts/quark/SELF_SWITCH b/nix/configuration/hosts/quark/SELF_SWITCH
index 7b3a91a5..54d4a78c 100755
--- a/nix/configuration/hosts/quark/SELF_SWITCH
+++ b/nix/configuration/hosts/quark/SELF_SWITCH
@@ -7,4 +7,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 : "${JOBS:="1"}"
 
 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nixos-rebuild switch --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#quark" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild switch --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#quark" --repair --log-format internal-json -v "${@}" |& nom --json
diff --git a/nix/configuration/hosts/recovery/DEPLOY_BOOT b/nix/configuration/hosts/recovery/DEPLOY_BOOT
index 181faf99..ac5fc69d 100755
--- a/nix/configuration/hosts/recovery/DEPLOY_BOOT
+++ b/nix/configuration/hosts/recovery/DEPLOY_BOOT
@@ -10,4 +10,4 @@ TARGET=recovery
 
 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
 
-nixos-rebuild boot --flake "$DIR/../../#recovery" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild boot --flake "$DIR/../../#recovery" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --repair --log-format internal-json -v "${@}" |& nom --json
diff --git a/nix/configuration/hosts/recovery/DEPLOY_SWITCH b/nix/configuration/hosts/recovery/DEPLOY_SWITCH
index bc5a8261..5523ed9f 100755
--- a/nix/configuration/hosts/recovery/DEPLOY_SWITCH
+++ b/nix/configuration/hosts/recovery/DEPLOY_SWITCH
@@ -10,4 +10,4 @@ TARGET=recovery
 
 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
 
-nixos-rebuild switch --flake "$DIR/../../#recovery" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild switch --flake "$DIR/../../#recovery" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --repair --log-format internal-json -v "${@}" |& nom --json
diff --git a/nix/configuration/hosts/recovery/ISO b/nix/configuration/hosts/recovery/ISO
index 9f9ff1d4..3f088b7b 100755
--- a/nix/configuration/hosts/recovery/ISO
+++ b/nix/configuration/hosts/recovery/ISO
@@ -7,4 +7,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 : "${JOBS:="1"}"
 
 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#recovery.iso" --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json
+nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#recovery.iso" --max-jobs "$JOBS" --repair --log-format internal-json -v "${@}" |& nom --json
diff --git a/nix/configuration/hosts/recovery/SELF_BOOT b/nix/configuration/hosts/recovery/SELF_BOOT
index 2addcd00..ee0a8e3c 100755
--- a/nix/configuration/hosts/recovery/SELF_BOOT
+++ b/nix/configuration/hosts/recovery/SELF_BOOT
@@ -7,4 +7,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 : "${JOBS:="1"}"
 
 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nixos-rebuild boot --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#recovery" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild boot --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#recovery" --repair --log-format internal-json -v "${@}" |& nom --json
diff --git a/nix/configuration/hosts/recovery/SELF_BUILD b/nix/configuration/hosts/recovery/SELF_BUILD
index e24c8311..b17afdd1 100755
--- a/nix/configuration/hosts/recovery/SELF_BUILD
+++ b/nix/configuration/hosts/recovery/SELF_BUILD
@@ -7,4 +7,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 : "${JOBS:="1"}"
 
 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nixos-rebuild build --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#recovery" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild build --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#recovery" --repair --log-format internal-json -v "${@}" |& nom --json
diff --git a/nix/configuration/hosts/recovery/SELF_SWITCH b/nix/configuration/hosts/recovery/SELF_SWITCH
index d0c54f68..b9375ce7 100755
--- a/nix/configuration/hosts/recovery/SELF_SWITCH
+++ b/nix/configuration/hosts/recovery/SELF_SWITCH
@@ -7,4 +7,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 : "${JOBS:="1"}"
 
 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nixos-rebuild switch --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#recovery" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild switch --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#recovery" --repair --log-format internal-json -v "${@}" |& nom --json