From e73bb63b52d4def1f4748e14ebc89b586d751011 Mon Sep 17 00:00:00 2001 From: Bailey Stevens Date: Mon, 22 Jan 2024 23:05:30 -0500 Subject: [PATCH] Fixes sysupdate script. --- packages/sysupdate/default.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/packages/sysupdate/default.nix b/packages/sysupdate/default.nix index af0df14..b771e1e 100644 --- a/packages/sysupdate/default.nix +++ b/packages/sysupdate/default.nix @@ -11,15 +11,18 @@ pkgs.writeShellApplication { ]; text = '' - NIXCONF="''${NIXCONF:-.}" + NIXCONF="''${NIXCONF:-/etc/nixos}" echo Building config from flake at: "$NIXCONF" 1>&2 - [[ "''${1:-}" == "home" ]] && \ - home-manager switch -L --flake "$NIXCONF" |& nom && \ - exit 0 - [ "$EUID" -eq 0 ] && \ + if [[ "''${1:-}" == "home" ]]; then + home-manager switch -L --flake "$NIXCONF" |& nom + exit $? + fi + if [ "$EUID" -ne 0 ]; then + echo Please rerun as root. 1>&2 + exit 1 + else nixos-rebuild switch --log-format internal-json -v --flake "$NIXCONF" |& nom --json && \ - exit 0 - echo Please rerun as root. 1>&2 - exit 1 + exit $? + fi ''; }