From 3d32f750f056af81f56fa242fafddc87c06d8c56 Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Sun, 26 Nov 2023 12:14:08 +0100 Subject: [PATCH] Use nix-output-monitor in all scripts --- home-manager/modules/common/default.nix | 2 +- scripts/build-raspi-image.sh | 4 ++-- scripts/install-home-manager.sh | 2 +- scripts/install_new_system.sh | 2 +- scripts/remote_switch.sh | 4 ++-- scripts/test_build.sh | 2 +- scripts/update_single_machine.sh | 2 +- shell.nix | 1 + 8 files changed, 10 insertions(+), 9 deletions(-) diff --git a/home-manager/modules/common/default.nix b/home-manager/modules/common/default.nix index bcc8a3b..d689ac9 100644 --- a/home-manager/modules/common/default.nix +++ b/home-manager/modules/common/default.nix @@ -79,7 +79,7 @@ format-modules = "nixpkgs-fmt **/*.nix"; nix-generations = "sudo nix-env --list-generations --profile /nix/var/nix/profiles/system"; rebuild = '' - nixos-rebuild -j auto switch --use-remote-sudo + nixos-rebuild -j auto switch --use-remote-sudo |& nom ''; find-garbage = "ls -l /nix/var/nix/gcroots/auto/ | sort | grep '/home/'"; vm = "vim"; diff --git a/scripts/build-raspi-image.sh b/scripts/build-raspi-image.sh index 47aacfd..74b8fb9 100755 --- a/scripts/build-raspi-image.sh +++ b/scripts/build-raspi-image.sh @@ -5,6 +5,6 @@ image=~/Downloads/$host.img.zst cd ~/.nixos/ -nix build .#images.$host && -cp result/sd-image/*.img.zst $image +nom build .#images.$host && + cp result/sd-image/*.img.zst $image chmod 644 $image diff --git a/scripts/install-home-manager.sh b/scripts/install-home-manager.sh index fe7bb6a..9ebc09f 100755 --- a/scripts/install-home-manager.sh +++ b/scripts/install-home-manager.sh @@ -6,4 +6,4 @@ echo "experimental-features = nix-command flakes" > ~/.config/nix/nix.conf nix-shell '' -A install rm ~/.config/nixpkgs/home.nix ln -s $HOME/.nixos/flake.nix $HOME/.config/nixpkgs/flake.nix -home-manager switch +home-manager switch |& nom diff --git a/scripts/install_new_system.sh b/scripts/install_new_system.sh index 5f15010..ce66967 100755 --- a/scripts/install_new_system.sh +++ b/scripts/install_new_system.sh @@ -2,4 +2,4 @@ host=$1 fqdn="nixos@nixos.2li.local" -nixos-rebuild switch --use-remote-sudo --target-host $fqdn --impure --flake ".#$host" +nixos-rebuild switch --use-remote-sudo --target-host $fqdn --impure --flake ".#$host" |& nom diff --git a/scripts/remote_switch.sh b/scripts/remote_switch.sh index f897306..ce46441 100755 --- a/scripts/remote_switch.sh +++ b/scripts/remote_switch.sh @@ -32,10 +32,10 @@ do fqdn="$host.2li.local" if [ $reboot -eq 0 ]; then echo $fqdn - nixos-rebuild switch -j auto --use-remote-sudo --target-host $fqdn --flake ".#$host" + nixos-rebuild switch -j auto --use-remote-sudo --target-host $fqdn --flake ".#$host" |& nom else echo "$fqdn with reboot" - nixos-rebuild boot -j auto --use-remote-sudo --target-host $fqdn --flake ".#$host" && + nixos-rebuild boot -j auto --use-remote-sudo --target-host $fqdn --flake ".#$host" |& nom ssh -i $rsa_key $fqdn 'sudo reboot' fi echo diff --git a/scripts/test_build.sh b/scripts/test_build.sh index bf1aa3a..4083b22 100755 --- a/scripts/test_build.sh +++ b/scripts/test_build.sh @@ -17,7 +17,7 @@ do continue fi echo $host - nixos-rebuild dry-build --flake .#${host} + nixos-rebuild dry-build --flake .#${host} |& nom echo echo done diff --git a/scripts/update_single_machine.sh b/scripts/update_single_machine.sh index 7e4c41b..96153c2 100755 --- a/scripts/update_single_machine.sh +++ b/scripts/update_single_machine.sh @@ -5,4 +5,4 @@ export NIX_SSHOPTS="-t -i $rsa_key" host=$1 fqdn="$host.2li.local" -nixos-rebuild switch --use-remote-sudo --target-host $fqdn --flake ".#$host" +nixos-rebuild switch --use-remote-sudo --target-host $fqdn --flake ".#$host" |& nom diff --git a/shell.nix b/shell.nix index 8721cec..6209896 100644 --- a/shell.nix +++ b/shell.nix @@ -4,6 +4,7 @@ pkgs.mkShell { nativeBuildInputs = with pkgs; [ git nixFlakes + nix-output-monitor python310 python310Packages.black python310Packages.mypy