1
1
Fork 0

nixos.sh: fix passing extra flags to nh

Signed-off-by: Myned <dev@bjork.tech>
This commit is contained in:
Myned 2024-10-17 00:42:22 -05:00
parent f86e222e48
commit ca5b252167
Signed by: myned
GPG key ID: C7224454F7881A34

View file

@ -20,7 +20,6 @@ cd /etc/nixos || exit 1
# @flag -p --poweroff Gracefully poweroff system after a successful build # @flag -p --poweroff Gracefully poweroff system after a successful build
# @flag -r --reboot Gracefully reboot system after a successful build # @flag -r --reboot Gracefully reboot system after a successful build
# @flag -u --update Update flake.lock before building # @flag -u --update Update flake.lock before building
# @arg extra~ Pass extra arguments to builder
build() { :; } build() { :; }
# Internal wrapper for subcommands # Internal wrapper for subcommands
@ -42,7 +41,7 @@ _build() {
else else
# Build current system # Build current system
if [[ "${argc_builder:-}" == nh ]]; then if [[ "${argc_builder:-}" == nh ]]; then
nh os "$1" ${argc_extra:+"${argc_extra[@]}"} nh os "$1" -- ${argc_extra:+"${argc_extra[@]}"}
elif [[ "${argc_builder:-}" == nixos ]]; then elif [[ "${argc_builder:-}" == nixos ]]; then
sudo nixos-rebuild "$1" ${argc_extra:+"${argc_extra[@]}"} sudo nixos-rebuild "$1" ${argc_extra:+"${argc_extra[@]}"}
fi fi
@ -59,14 +58,17 @@ _build() {
# @cmd Build and boot NixOS configuration # @cmd Build and boot NixOS configuration
# @alias b,bo,boo # @alias b,bo,boo
# @arg extra~ Pass extra arguments to builder
build::boot() { _build boot; } build::boot() { _build boot; }
# @cmd Build and switch NixOS configuration # @cmd Build and switch NixOS configuration
# @alias s,sw,swi,swit,switc # @alias s,sw,swi,swit,switc
# @arg extra~ Pass extra arguments to builder
build::switch() { _build switch; } build::switch() { _build switch; }
# @cmd Build and test NixOS configuration # @cmd Build and test NixOS configuration
# @alias t,te,tes # @alias t,te,tes
# @arg extra~ Pass extra arguments to builder
build::test() { _build test; } build::test() { _build test; }
# @cmd Compare NixOS system generations # @cmd Compare NixOS system generations