From 287053b909d43db27482c2bbffc0cd038fbb4fbe Mon Sep 17 00:00:00 2001 From: ediblerope Date: Mon, 4 May 2026 19:58:49 +0100 Subject: [PATCH] common: wire nix-output-monitor into the update alias Adds nix-output-monitor to systemPackages and pipes nixos-rebuild's internal-json log stream through `nom --json` for both the build and switch steps. set -o pipefail at the top so a failed rebuild aborts the chain (otherwise && only sees nom's exit code, which is always 0). Co-Authored-By: Claude Opus 4.7 --- common.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common.nix b/common.nix index 51cdfba..a585d72 100644 --- a/common.nix +++ b/common.nix @@ -84,7 +84,7 @@ # Shell aliases (work in both bash and fish) environment.shellAliases = { - update = "bash -c 'OLD_SYSTEM=$(readlink /run/current-system) && sudo nixos-rebuild build $@ --impure --flake git+https://forg.gregersen.it/rope/nixos && sudo nixos-rebuild switch $@ --impure --flake git+https://forg.gregersen.it/rope/nixos && nvd diff $OLD_SYSTEM /run/current-system && (command -v record-update &>/dev/null && record-update $OLD_SYSTEM /run/current-system || true) && command -v matugen &>/dev/null && matugen image ~/.local/share/backgrounds/wallpaper.png -m dark || true' --"; + update = "bash -c 'set -o pipefail && OLD_SYSTEM=$(readlink /run/current-system) && sudo nixos-rebuild build $@ --impure --flake git+https://forg.gregersen.it/rope/nixos -L --log-format internal-json 2>&1 | nom --json && sudo nixos-rebuild switch $@ --impure --flake git+https://forg.gregersen.it/rope/nixos -L --log-format internal-json 2>&1 | nom --json && nvd diff $OLD_SYSTEM /run/current-system && (command -v record-update &>/dev/null && record-update $OLD_SYSTEM /run/current-system || true) && command -v matugen &>/dev/null && matugen image ~/.local/share/backgrounds/wallpaper.png -m dark || true' --"; clean = "sudo nix-collect-garbage -d"; ll = "ls -alh"; clear = "command clear"; @@ -96,6 +96,7 @@ git localsend nvd + nix-output-monitor busybox ]; }