Check arch in justfile

README.md

@@ -11,16 +11,10 @@ The configuration is very specific to my own machines and setup, but it may be a
 
 Recipes are stored in a justfile. [just](https://github.com/casey/just) is required.
 
-To run a NixOS rebuild:
+To run a rebuild:
 
 ```sh
-just build-linux
-```
-
-To run a macOS rebuild:
-
-```sh
-just build-mac
+just rebuild
 ```
 
 ## Update
@@ -38,13 +32,7 @@ If there are updates, they should be reflected in [flake.lock](./flake.lock).
 To rollback to the previous generation:
 
 ```sh
-just rollback-linux
-```
-
-or on macOS:
-
-```sh
-just rollback-mac
+just rollback
 ```
 
 ## Garbage collection

justfile

@@ -1,21 +1,15 @@
 set export
 
 config := "machines/$(hostname)/configuration.nix"
-arch := `uname s`
+arch := `uname -s`
 
-cmd := if arch == "Linux" { "nixos-rebuild" } else { "darwin-rebuild" }
+cmd := if arch == "Linux" { "nixos-rebuild --use-remote-sudo" } else { "darwin-rebuild" }
 
-build-linux:
-  nixos-rebuild --use-remote-sudo -I nixos-config=$config switch --flake .
+rebuild:
+  $cmd switch --flake . -I nixos-config=$config
 
-build-mac:
-	darwin-rebuild switch -I nixos-config=$config --flake .
-
-rollback-linux:
-  nixos-rebuild --use-remote-sudo switch --rollback -I nixos-config=$config
-
-rollback-mac:
-  darwin-rebuild --rollback -I nixos-config=$config
+rollback:
+  $cmd switch --rollback -I nixos-config=$config
 
 update:
   @./nix-flake-update.sh

nix-flake-update.sh

@@ -2,18 +2,9 @@
 
 set -euo pipefail
 
-arch=$(uname -s)
-
 git pull
 update_msg=$(nix flake update 2>&1 | grep -v 'warning:')
-if [[ $arch == "Linux" ]]; then
-  just build-linux
-elif [[ $arch == "Darwin" ]]; then
-  just build-mac
-else
-  echo "Unsupported OS: $arch"
-  exit 1
-fi
+just rebuild
 git add .
 git commit -S -m "nix flake update: $(TZ=UTC date '+%Y-%m-%d %H:%M:%S %Z')