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>
82 lines
3.5 KiB
Bash
Executable File
82 lines
3.5 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
set -e
|
|
|
|
# Nomarchy on-boot initialization script.
|
|
# Automatically detects the hardware, applies necessary runtime tweaks,
|
|
# and sets the correct screen resolution/scaling.
|
|
|
|
# 1. Automatically configure optimal screen resolution and scaling
|
|
nomarchy-hyprland-monitor-scaling-cycle >/dev/null 2>&1
|
|
|
|
# 2. Hardware-specific runtime tweaks
|
|
if nomarchy-hw-match "Laptop 16"; then
|
|
# Framework 16 specific tweaks
|
|
nomarchy-theme-set-keyboard-f16 >/dev/null 2>&1
|
|
fi
|
|
|
|
if nomarchy-hw-asus-rog; then
|
|
# Asus ROG specific tweaks
|
|
nomarchy-theme-set-keyboard-asus-rog >/dev/null 2>&1
|
|
fi
|
|
|
|
# 3. Declarative hardware configuration check (nixos-hardware)
|
|
# This part ensures that if we are on an installed system, the correct
|
|
# nixos-hardware module is selected in the configuration.
|
|
# Skip this in the Live ISO environment
|
|
if [[ $USER == "nixos" ]] || [[ -f /etc/nixos/hosts/nomarchy-live.nix ]]; then
|
|
exit 0
|
|
fi
|
|
|
|
HW_FILE="/etc/nixos/hardware-selection.nix"
|
|
if [ -w "$HW_FILE" ]; then
|
|
PRODUCT_NAME=$(cat /sys/class/dmi/id/product_name 2>/dev/null || echo "Unknown")
|
|
BOARD_NAME=$(cat /sys/class/dmi/id/board_name 2>/dev/null || echo "Unknown")
|
|
CPU_VENDOR=$(lscpu | grep "Vendor ID" | awk '{print $3}')
|
|
|
|
NEW_HW_MODULES=""
|
|
|
|
if [[ "$CPU_VENDOR" == "AuthenticAMD" ]]; then
|
|
NEW_HW_MODULES="inputs.nixos-hardware.nixosModules.common-cpu-amd"
|
|
elif [[ "$CPU_VENDOR" == "GenuineIntel" ]]; then
|
|
NEW_HW_MODULES="inputs.nixos-hardware.nixosModules.common-cpu-intel"
|
|
fi
|
|
|
|
# Auto-detect specific known models for nixos-hardware
|
|
if echo "$PRODUCT_NAME" | grep -qi "XPS 15 9500"; then
|
|
NEW_HW_MODULES="$NEW_HW_MODULES\n inputs.nixos-hardware.nixosModules.dell-xps-15-9500"
|
|
elif echo "$PRODUCT_NAME" | grep -qi "XPS 13"; then
|
|
NEW_HW_MODULES="$NEW_HW_MODULES\n inputs.nixos-hardware.nixosModules.dell-xps-13-9300" # fallback example
|
|
elif echo "$PRODUCT_NAME" | grep -qi "Framework Laptop 16"; then
|
|
NEW_HW_MODULES="$NEW_HW_MODULES\n inputs.nixos-hardware.nixosModules.framework-16-7040-amd"
|
|
elif echo "$PRODUCT_NAME" | grep -qi "Framework Laptop 13"; then
|
|
NEW_HW_MODULES="$NEW_HW_MODULES\n inputs.nixos-hardware.nixosModules.framework-13-7040-amd"
|
|
elif echo "$PRODUCT_NAME" | grep -qi "Surface"; then
|
|
NEW_HW_MODULES="$NEW_HW_MODULES\n inputs.nixos-hardware.nixosModules.microsoft-surface-pro-8" # fallback example
|
|
elif echo "$PRODUCT_NAME" | grep -qi "Zephyrus G14"; then
|
|
NEW_HW_MODULES="$NEW_HW_MODULES\n inputs.nixos-hardware.nixosModules.asus-zephyrus-g14"
|
|
elif echo "$PRODUCT_NAME" | grep -qi "ThinkPad X1 Carbon"; then
|
|
NEW_HW_MODULES="$NEW_HW_MODULES\n inputs.nixos-hardware.nixosModules.lenovo-thinkpad-x1-carbon-gen9"
|
|
fi
|
|
|
|
# Check if the current HW file differs from our detection
|
|
if [ -n "$NEW_HW_MODULES" ] && ! grep -q "common-cpu" "$HW_FILE"; then
|
|
# This is a basic detection. We overwrite it if it's completely empty or missing common-cpu.
|
|
# It's better to let the user know, or auto-apply. We'll auto-apply for a smooth experience.
|
|
cat <<EOF > "$HW_FILE.tmp"
|
|
{ inputs, ... }:
|
|
{
|
|
imports = [
|
|
$NEW_HW_MODULES
|
|
];
|
|
}
|
|
EOF
|
|
if ! cmp -s "$HW_FILE" "$HW_FILE.tmp"; then
|
|
mv "$HW_FILE.tmp" "$HW_FILE"
|
|
# We notify the user instead of running sys-update silently, as it requires root and time.
|
|
notify-send -u normal "Hardware Auto-Detection" "New hardware profile detected. Please run 'sys-update' when ready."
|
|
else
|
|
rm "$HW_FILE.tmp"
|
|
fi
|
|
fi
|
|
fi
|