1e9481849b
Sweep across the three script directories: features/scripts/utils,
core/system/scripts, themes/engine/scripts. 142 of 169 bash scripts
gained `set -e`; 27 already had it; the one Python helper
(nomarchy-haptic-touchpad) was skipped via shebang detection.
Why: bash's default behavior is to continue past a failed command,
which means a script that does "do A; do B; do C" leaves the system
in a half-applied state when B fails - and the user gets no signal.
Several recent fix commits (theme partial-apply, waybar reload race,
installer prewipe silent failures) all trace back to this. set -e
turns silent corruption into a loud abort the user can act on.
The 11 scripts with explicit `|| true` markers stay safe under set -e
because || true coerces the exit to zero; the markers continue to
mean "I deliberately tolerate this failure here."
Deliberate exception: nomarchy-menu runs WITHOUT set -e. It is an
interactive UX loop where action branches do `cmd; back_to <self>`
so a failed action would abort the script under set -e and the menu
would disappear without feedback. Soft-failure - menu re-displays,
user picks again - is the right semantic. Documented inline.
Validation: bash -n on every modified script (zero failures). The
new pre-commit hook (27f5663) was just updated to filter by shebang
so it doesn't try to bash-syntax-check the Python helper - that
filter was uncovered by this sweep.
Risk: set -e can surface latent bugs in scripts that previously
relied on silent continuation. If anything breaks, it's a real bug
that was already broken and is now visible. Easy per-script revert
if any UX glitches show up.
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
49 lines
1.5 KiB
Bash
Executable File
49 lines
1.5 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
set -e
|
|
|
|
# Toggle dedicated vs integrated GPU mode via supergfxd (for hybrid gpu laptops, like Asus G14).
|
|
# Declarative enablement + Runtime mode switching for Nomarchy NixOS.
|
|
|
|
STATE_FILE="/etc/nixos/state.json"
|
|
|
|
# Check if supergfxd is enabled in config
|
|
if [[ $(sudo jq -r '.features.hybridGPU // false' "$STATE_FILE") != "true" ]]; then
|
|
if gum confirm "Hybrid GPU support is not enabled. Enable it now? (Requires sys-update)"; then
|
|
sudo jq '.features.hybridGPU = true' "$STATE_FILE" > /tmp/state.json && sudo mv /tmp/state.json "$STATE_FILE"
|
|
echo "Hybrid GPU support enabled in configuration. Applying changes..."
|
|
sudo nomarchy-sys-update
|
|
echo "Please run this command again after the update."
|
|
exit 0
|
|
fi
|
|
exit 1
|
|
fi
|
|
|
|
if ! command -v supergfxctl &> /dev/null; then
|
|
echo "supergfxctl not found. Is the system updated?"
|
|
exit 1
|
|
fi
|
|
|
|
gpu_mode=$(supergfxctl -g)
|
|
echo "Current GPU mode: $gpu_mode"
|
|
|
|
case "$gpu_mode" in
|
|
"Integrated")
|
|
if gum confirm "Switch to Hybrid mode (enables dGPU) and reboot?"; then
|
|
supergfxctl -m Hybrid
|
|
echo "Switching to Hybrid mode..."
|
|
nomarchy-system-reboot
|
|
fi
|
|
;;
|
|
"Hybrid")
|
|
if gum confirm "Switch to Integrated mode (disables dGPU) and reboot?"; then
|
|
supergfxctl -m Integrated
|
|
echo "Switching to Integrated mode..."
|
|
nomarchy-system-reboot
|
|
fi
|
|
;;
|
|
*)
|
|
echo "Hybrid GPU in unknown mode: $gpu_mode. Try 'supergfxctl -m Hybrid' manually."
|
|
exit 1
|
|
;;
|
|
esac
|