From 6413adad9c221d3698fa5f5767df71f9e02bd4bb Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Tue, 6 Oct 2026 17:44:33 -0400 Subject: [PATCH] Remove repair during build. Turns out the repair during build code path is poorly tested and causes errors. ref: https://discourse.nixos.org/t/error-getting-attributes-of-path-when-using-my-substituter/80448 --- 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 22838ae..c9a277d 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" --repair --log-format internal-json -v "${@}" |& nom --json +nixos-rebuild boot --flake "$DIR/../../#family_disks" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --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 d49fbe5..1127ca9 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" --repair --log-format internal-json -v "${@}" |& nom --json +nixos-rebuild switch --flake "$DIR/../../#family_disks" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json diff --git a/nix/configuration/hosts/family_disks/ISO b/nix/configuration/hosts/family_disks/ISO index 675f901..9b32e0c 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" --repair --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" --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 43c670c..e1213f7 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" --repair --log-format internal-json -v "${@}" |& nom --json +nixos-rebuild boot --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#family_disks" --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 063b842..e7c691b 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" --repair --log-format internal-json -v "${@}" |& nom --json +nixos-rebuild build --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#family_disks" --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 29ba622..ce66540 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" --repair --log-format internal-json -v "${@}" |& nom --json +nixos-rebuild switch --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#family_disks" --log-format internal-json -v "${@}" |& nom --json diff --git a/nix/configuration/hosts/hydra/DEPLOY_BOOT b/nix/configuration/hosts/hydra/DEPLOY_BOOT index ef5538c..05aa605 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" --repair --log-format internal-json -v "${@}" |& nom --json +nixos-rebuild boot --flake "$DIR/../../#hydra" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json diff --git a/nix/configuration/hosts/hydra/DEPLOY_SWITCH b/nix/configuration/hosts/hydra/DEPLOY_SWITCH index 45765f0..379103d 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" --repair --log-format internal-json -v "${@}" |& nom --json +nixos-rebuild switch --flake "$DIR/../../#hydra" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json diff --git a/nix/configuration/hosts/hydra/ISO b/nix/configuration/hosts/hydra/ISO index 02e8d82..b9afe0a 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" --repair --log-format internal-json -v "${@}" |& nom --json +nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#hydra.iso" --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json diff --git a/nix/configuration/hosts/hydra/SELF_BOOT b/nix/configuration/hosts/hydra/SELF_BOOT index 247f447..b095e35 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" --repair --log-format internal-json -v "${@}" |& nom --json +nixos-rebuild boot --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#hydra" --log-format internal-json -v "${@}" |& nom --json diff --git a/nix/configuration/hosts/hydra/SELF_BUILD b/nix/configuration/hosts/hydra/SELF_BUILD index ab17462..1a0007b 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" --repair --log-format internal-json -v "${@}" |& nom --json +nixos-rebuild build --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#hydra" --log-format internal-json -v "${@}" |& nom --json diff --git a/nix/configuration/hosts/hydra/SELF_SWITCH b/nix/configuration/hosts/hydra/SELF_SWITCH index 1dae233..f0e2f7f 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" --repair --log-format internal-json -v "${@}" |& nom --json +nixos-rebuild switch --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#hydra" --log-format internal-json -v "${@}" |& nom --json diff --git a/nix/configuration/hosts/hydra/VM_ISO b/nix/configuration/hosts/hydra/VM_ISO index 8110ba0..17175ff 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" --repair --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" --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 8fd2c47..915b19b 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" --repair --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" --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 b7e799c..29cf990 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" --repair --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" --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 9eea704..6ca5b92 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" --repair --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" --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 822d398..b976f8d 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" --repair --log-format internal-json -v "${@}" |& nom --json +nixos-rebuild boot --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#i_only_boot_zfs" --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 0ce2ac3..cc10bfe 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" --repair --log-format internal-json -v "${@}" |& nom --json +nixos-rebuild build --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#i_only_boot_zfs" --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 e551867..1915408 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" --repair --log-format internal-json -v "${@}" |& nom --json +nixos-rebuild switch --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#i_only_boot_zfs" --log-format internal-json -v "${@}" |& nom --json diff --git a/nix/configuration/hosts/neelix/DEPLOY_BOOT b/nix/configuration/hosts/neelix/DEPLOY_BOOT index 35f579d..7353437 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" --repair --log-format internal-json -v "${@}" |& nom --json +nixos-rebuild boot --flake "$DIR/../../#neelix" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --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 47ffdbe..0aed141 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" --repair --log-format internal-json -v "${@}" |& nom --json +nixos-rebuild switch --flake "$DIR/../../#neelix" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --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 e517708..1de14e3 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" --repair --log-format internal-json -v "${@}" |& nom --json +nixos-rebuild boot --flake "$DIR/../../#odo" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json diff --git a/nix/configuration/hosts/odo/DEPLOY_SWITCH b/nix/configuration/hosts/odo/DEPLOY_SWITCH index c973dd5..6fe6d7a 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" --repair --log-format internal-json -v "${@}" |& nom --json +nixos-rebuild switch --flake "$DIR/../../#odo" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json diff --git a/nix/configuration/hosts/odo/ISO b/nix/configuration/hosts/odo/ISO index 2c36847..50f216d 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" --repair --log-format internal-json -v "${@}" |& nom --json +nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#odo.iso" --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json diff --git a/nix/configuration/hosts/odo/SELF_BOOT b/nix/configuration/hosts/odo/SELF_BOOT index a81492b..ff6c55c 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" --repair --log-format internal-json -v "${@}" |& nom --json +nixos-rebuild boot --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#odo" --log-format internal-json -v "${@}" |& nom --json diff --git a/nix/configuration/hosts/odo/SELF_BUILD b/nix/configuration/hosts/odo/SELF_BUILD index 020d771..d2a342a 100755 --- a/nix/configuration/hosts/odo/SELF_BUILD +++ b/nix/configuration/hosts/odo/SELF_BUILD @@ -8,4 +8,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" --repair --log-format internal-json -v "${@}" |& nom --json +nixos-rebuild build --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#odo" --log-format internal-json -v "${@}" |& nom --json diff --git a/nix/configuration/hosts/odo/SELF_SWITCH b/nix/configuration/hosts/odo/SELF_SWITCH index a6d2286..0f1423f 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" --repair --log-format internal-json -v "${@}" |& nom --json +nixos-rebuild switch --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#odo" --log-format internal-json -v "${@}" |& nom --json diff --git a/nix/configuration/hosts/odowork/DEPLOY_BOOT b/nix/configuration/hosts/odowork/DEPLOY_BOOT index f7f3ac7..5de1f2f 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" --repair --log-format internal-json -v "${@}" |& nom --json +nixos-rebuild boot --flake "$DIR/../../#odowork" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json diff --git a/nix/configuration/hosts/odowork/DEPLOY_SWITCH b/nix/configuration/hosts/odowork/DEPLOY_SWITCH index f1065c9..232b8b4 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" --repair --log-format internal-json -v "${@}" |& nom --json +nixos-rebuild switch --flake "$DIR/../../#odowork" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json diff --git a/nix/configuration/hosts/odowork/INSTALLER b/nix/configuration/hosts/odowork/INSTALLER index 06ee4a7..2dd62df 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" --repair --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json +nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#odowork.installer" --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 4ad3013..581a575 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" --repair --log-format internal-json -v "${@}" |& nom --json +nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#odowork.iso" --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json diff --git a/nix/configuration/hosts/odowork/SELF_BOOT b/nix/configuration/hosts/odowork/SELF_BOOT index b4ee868..55d395e 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" --repair --log-format internal-json -v "${@}" |& nom --json +nixos-rebuild boot --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#odowork" --log-format internal-json -v "${@}" |& nom --json diff --git a/nix/configuration/hosts/odowork/SELF_BUILD b/nix/configuration/hosts/odowork/SELF_BUILD index 69e5491..a06c498 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" --repair --log-format internal-json -v "${@}" |& nom --json +nixos-rebuild build --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#odowork" --log-format internal-json -v "${@}" |& nom --json diff --git a/nix/configuration/hosts/odowork/SELF_SWITCH b/nix/configuration/hosts/odowork/SELF_SWITCH index 5ddfba3..84a1825 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" --repair --log-format internal-json -v "${@}" |& nom --json +nixos-rebuild switch --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#odowork" --log-format internal-json -v "${@}" |& nom --json diff --git a/nix/configuration/hosts/quark/DEPLOY_BOOT b/nix/configuration/hosts/quark/DEPLOY_BOOT index 506d976..4e59f16 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" --repair --log-format internal-json -v "${@}" |& nom --json +nixos-rebuild boot --flake "$DIR/../../#quark" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json diff --git a/nix/configuration/hosts/quark/DEPLOY_SWITCH b/nix/configuration/hosts/quark/DEPLOY_SWITCH index 52a0a18..dbabca4 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" --repair --log-format internal-json -v "${@}" |& nom --json +nixos-rebuild switch --flake "$DIR/../../#quark" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json diff --git a/nix/configuration/hosts/quark/ISO b/nix/configuration/hosts/quark/ISO index a5b6474..da8f353 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" --repair --log-format internal-json -v "${@}" |& nom --json +nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#quark.iso" --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json diff --git a/nix/configuration/hosts/quark/SELF_BOOT b/nix/configuration/hosts/quark/SELF_BOOT index a0be2be..0387013 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" --repair --log-format internal-json -v "${@}" |& nom --json +nixos-rebuild boot --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#quark" --log-format internal-json -v "${@}" |& nom --json diff --git a/nix/configuration/hosts/quark/SELF_BUILD b/nix/configuration/hosts/quark/SELF_BUILD index 7484361..6966a6b 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" --repair --log-format internal-json -v "${@}" |& nom --json +nixos-rebuild build --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#quark" --log-format internal-json -v "${@}" |& nom --json diff --git a/nix/configuration/hosts/quark/SELF_SWITCH b/nix/configuration/hosts/quark/SELF_SWITCH index 54d4a78..7b3a91a 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" --repair --log-format internal-json -v "${@}" |& nom --json +nixos-rebuild switch --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#quark" --log-format internal-json -v "${@}" |& nom --json diff --git a/nix/configuration/hosts/recovery/DEPLOY_BOOT b/nix/configuration/hosts/recovery/DEPLOY_BOOT index ac5fc69..181faf9 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" --repair --log-format internal-json -v "${@}" |& nom --json +nixos-rebuild boot --flake "$DIR/../../#recovery" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json diff --git a/nix/configuration/hosts/recovery/DEPLOY_SWITCH b/nix/configuration/hosts/recovery/DEPLOY_SWITCH index 5523ed9..bc5a826 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" --repair --log-format internal-json -v "${@}" |& nom --json +nixos-rebuild switch --flake "$DIR/../../#recovery" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json diff --git a/nix/configuration/hosts/recovery/ISO b/nix/configuration/hosts/recovery/ISO index 3f088b7..9f9ff1d 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" --repair --log-format internal-json -v "${@}" |& nom --json +nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#recovery.iso" --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json diff --git a/nix/configuration/hosts/recovery/SELF_BOOT b/nix/configuration/hosts/recovery/SELF_BOOT index ee0a8e3..2addcd0 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" --repair --log-format internal-json -v "${@}" |& nom --json +nixos-rebuild boot --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#recovery" --log-format internal-json -v "${@}" |& nom --json diff --git a/nix/configuration/hosts/recovery/SELF_BUILD b/nix/configuration/hosts/recovery/SELF_BUILD index b17afdd..e24c831 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" --repair --log-format internal-json -v "${@}" |& nom --json +nixos-rebuild build --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#recovery" --log-format internal-json -v "${@}" |& nom --json diff --git a/nix/configuration/hosts/recovery/SELF_SWITCH b/nix/configuration/hosts/recovery/SELF_SWITCH index b9375ce..d0c54f6 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" --repair --log-format internal-json -v "${@}" |& nom --json +nixos-rebuild switch --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#recovery" --log-format internal-json -v "${@}" |& nom --json