fix(githooks): skip bash linting on non-bash nomarchy-* scripts

The nomarchy-* prefix is a name convention, not a language guarantee:
nomarchy-haptic-touchpad is Python. Without a shebang filter, the
pre-commit hook would run `bash -n` on it and abort every commit
that touched the Python helper. Filter to scripts whose shebang
matches `bash` before linting; everything else passes through.

Found via the set -e sweep (1e94818) — the survey caught
nomarchy-haptic-touchpad as a "broken" bash script when it was
just non-bash.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

.githooks/pre-commit

@@ -4,9 +4,12 @@
 # Enable per-clone with:
 #   git config core.hooksPath .githooks
 #
-# Re-runs the script audit generator when any nomarchy-* script in the three
+# Two responsibilities:
-# script directories is added, modified, or deleted in this commit, then
+#  1. Lint changed nomarchy-* scripts (bash -n + shellcheck if available)
-# stages the refreshed docs/SCRIPTS.md so it lands together with the change.
+#     so syntax errors and unquoted-var bugs don't ship.
+#  2. Regenerate docs/SCRIPTS.md when any nomarchy-* script under the three
+#     script directories is added, modified, or deleted in this commit, and
+#     stage the refreshed file so it lands with the change.
 
 set -e
 
@@ -15,6 +18,35 @@ cd "$repo_root"
 
 script_dirs_re='^(features/scripts/utils|core/system/scripts|themes/engine/scripts)/nomarchy-'
 
+# 1. Lint changed scripts. bash -n catches syntax errors (always fatal).
+# shellcheck catches unquoted-var, use-before-define, missing-shebang, etc.
+# We only fail on severity=error so the long tail of pre-existing warnings
+# (info / style / warning) doesn't block commits — those can be cleaned up
+# incrementally without a flag day.
+changed_scripts=$(git diff --cached --name-only --diff-filter=ACMR \
+                  | grep -E "$script_dirs_re" || true)
+if [[ -n "$changed_scripts" ]]; then
+  while IFS= read -r script; do
+    [[ -f "$script" ]] || continue
+    # Only lint scripts with a bash shebang. nomarchy-* is a name
+    # convention, not a language guarantee — at least one Python helper
+    # ships under the same prefix (nomarchy-haptic-touchpad).
+    head -1 "$script" | grep -qE '^#!.*\bbash\b' || continue
+    if ! bash -n "$script"; then
+      echo "pre-commit: bash syntax error in $script — aborting commit." >&2
+      exit 1
+    fi
+    if command -v shellcheck >/dev/null 2>&1; then
+      if ! shellcheck --severity=error --shell=bash "$script"; then
+        echo "pre-commit: shellcheck found error-level issues in $script — aborting commit." >&2
+        echo "pre-commit: fix the reported issues, or rerun with --no-verify after a deliberate decision to ship." >&2
+        exit 1
+      fi
+    fi
+  done <<< "$changed_scripts"
+fi
+
+# 2. Regenerate the script audit doc.
 if git diff --cached --name-only --diff-filter=ACMRD | grep -qE "$script_dirs_re"; then
   echo "pre-commit: regenerating docs/SCRIPTS.md (script change detected)…"
   ./bin/utils/nomarchy-docs-scripts --out docs/SCRIPTS.md

core/home/default.nix

@@ -10,5 +10,6 @@
     ./configs.nix
     ./security.nix
     ./bash.nix
+    ./gaming.nix
   ];
 }

core/home/gaming.nix

@@ -0,0 +1,12 @@
+{ config, lib, ... }:
+
+let
+  cfg = config.nomarchy.gaming;
+in
+{
+  config = lib.mkIf cfg.enable {
+    wayland.windowManager.hyprland.extraConfig = ''
+      windowrulev2 = fullscreen, class:^(steam_app_).*$
+    '';
+  };
+}

core/home/options.nix

@@ -128,5 +128,16 @@
         '';
       };
     };
+
+    gaming = {
+      enable = lib.mkEnableOption ''
+        Gaming preset (home-side companion to nomarchy.system.gaming.enable).
+        Adds a Hyprland window rule that fullscreens windows whose class
+        matches steam_app_* — i.e. games launched through Steam — so they
+        grab the whole screen instead of opening windowed. Set this to the
+        same value as nomarchy.system.gaming.enable; the installer flips
+        both when the Gaming profile is selected.
+      '';
+    };
   };
 }

core/system/scripts/nomarchy-battery-capacity

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Returns the battery full capacity in Wh (rounded to whole number).
 # Used by nomarchy-battery-status for displaying battery capacity.

core/system/scripts/nomarchy-battery-monitor

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Designed to be run by systemd timer every 30 seconds and alerts if battery is low
 

core/system/scripts/nomarchy-battery-present

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Returns true if a battery is present on the system.
 # Used by the battery monitor and other battery-related checks.

core/system/scripts/nomarchy-battery-remaining

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Returns the battery percentage remaining as an integer.
 # Used by the battery monitor and the Ctrl + Shift + Super + B hotkey.

core/system/scripts/nomarchy-battery-remaining-time

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Returns the battery time remaining (to empty or full) in a compact format.
 

core/system/scripts/nomarchy-battery-status

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Returns a formatted battery status string with percentage and power draw/charge.
 # Used by the battery notification hotkey (Ctrl + Shift + Super + B).

core/system/scripts/nomarchy-brightness-display

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Adjust brightness on the most likely display device.
 # Usage: nomarchy-brightness-display <step>

core/system/scripts/nomarchy-brightness-display-apple

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Adjust the brightness on Apple Studio Displays and Apple XDR Displays using asdcontrol.
 

core/system/scripts/nomarchy-brightness-keyboard

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Adjust keyboard backlight brightness using available steps.
 # Usage: nomarchy-brightness-keyboard <up|down|cycle>

core/system/scripts/nomarchy-hibernation-available

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Check if hibernation is supported
 if [[ ! -f /sys/power/image_size ]]; then

core/system/scripts/nomarchy-hibernation-remove

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Removes hibernation setup: disables swap, removes swapfile, removes fstab entry,
 # removes resume hook, and removes suspend-then-hibernate configuration.

core/system/scripts/nomarchy-hibernation-setup

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Creates a swap file in the btrfs subvolume, adds the swap file to /etc/fstab,
 # adds a resume hook to mkinitcpio, and configures suspend-then-hibernate.

core/system/scripts/nomarchy-hw-asus-rog

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Detect whether the computer is an Asus ROG machine.
 

core/system/scripts/nomarchy-hw-match

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Match against the computer's DMI product name (case-insensitive).
 # Usage: nomarchy-hw-match "XPS"

core/system/scripts/nomarchy-hw-vulkan

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Detect whether Vulkan is available.
 

core/system/scripts/nomarchy-pkg-add

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -e
 
 PKG_NAME="$1"
 

core/system/scripts/nomarchy-pkg-remove

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -e
 
 PKG_NAME="$1"
 

core/system/scripts/nomarchy-powerprofiles-list

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Returns a list of all the available power profiles on the system.
 # Used by the Nomarchy Menu under Setup > Power Profile.

core/system/scripts/nomarchy-preflight-migration

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -e
 # Nomarchy Pre-flight State Migration
 # Migrates legacy state files into the unified state.json before Nix evaluation
 

core/system/scripts/nomarchy-restart-bluetooth

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Unblock and restart the bluetooth service.
 

core/system/scripts/nomarchy-restart-pipewire

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Restart the PipeWire audio service to fix audio issues or apply new configuration.
 

core/system/scripts/nomarchy-restart-trackpad

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Reload the intel_quicki2c driver to fix a dead trackpad.
 # The THC (Touch Host Controller) can fail to initialize interrupts

core/system/scripts/nomarchy-restart-wifi

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Unblock and restart the Wi-Fi service.
 

core/system/scripts/nomarchy-restart-xcompose

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Restart the XCompose input method service (fcitx5) to apply new compose key settings.
 

core/system/scripts/nomarchy-setup-dns

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -e
 
 # Configure DNS declaratively for Nomarchy NixOS.
 # Hybrid: updates /etc/nixos/state.json and runs sys-update.

core/system/scripts/nomarchy-setup-fido2

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -e
 
 # Configure FIDO2 support declaratively for Nomarchy NixOS.
 

core/system/scripts/nomarchy-setup-fingerprint

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -e
 
 # Configure fingerprint support declaratively for Nomarchy NixOS.
 

core/system/scripts/nomarchy-sudo-keepalive

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Prompt for sudo once and keep the credential alive in the background.
 # Source this script so the trap applies to the calling shell:

core/system/scripts/nomarchy-sudo-passwordless-toggle

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Toggle passwordless sudo for the current user.
 # First run: enables passwordless sudo for 15 minutes (after confirmation).

core/system/scripts/nomarchy-sudo-reset

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Reset the sudo lockout/faillock for the current user.
 # This clears any failed authentication attempts that may have locked the user out.

core/system/scripts/nomarchy-swayosd-brightness

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Display brightness level using SwayOSD on the current monitor.
 # Usage: nomarchy-swayosd-brightness <percent>

core/system/scripts/nomarchy-swayosd-kbd-brightness

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Display keyboard brightness level using SwayOSD on the current monitor.
 # Usage: nomarchy-swayosd-kbd-brightness <percent>

core/system/scripts/nomarchy-system-logout

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Logout command that first closes all application windows (thus giving them a chance to save state),
 # then stops the session, returning to the SDDM login screen.

core/system/scripts/nomarchy-system-reboot

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Reboot command that first closes all application windows (thus giving them a chance to save state).
 # This is particularly helpful for applications like Chromium that otherwise won't shutdown cleanly.

core/system/scripts/nomarchy-system-shutdown

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Shutdown command that first closes all application windows (thus giving them a chance to save state).
 # This is particularly helpful for applications like Chromium that otherwise won't shutdown cleanly.

core/system/scripts/nomarchy-toggle-hybrid-gpu

@@ -1,4 +1,5 @@
 #!/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.

core/system/scripts/nomarchy-toggle-idle

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -e
 
 # Toggles the idle daemon (hypridle) between enabled and disabled.
 # Hybrid: updates state.json and provides instant feedback.

core/system/scripts/nomarchy-toggle-suspend

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -e
 
 # Toggles the suspend menu option availability.
 # Hybrid: updates state.json and runs env-update for persistence.

core/system/scripts/nomarchy-tz-select

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -e
 
 # Select system timezone declaratively for Nomarchy NixOS.
 

core/system/scripts/nomarchy-update-time

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 echo "Updating time..."
 sudo systemctl restart systemd-timesyncd

core/system/scripts/nomarchy-wifi-powersave

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -e
 
 # Toggles wifi power saving declaratively.
 # Usage: nomarchy-wifi-powersave <on|off>

docs/MIGRATION.md

@@ -232,7 +232,7 @@ nomarchy-test-live-iso       # boots the ISO in QEMU to evaluate
 The ISO autologins to a Hyprland live session that points you at:
 
 - `sudo /etc/install.sh` — install (BTRFS + LUKS + subvolumes per
-  `installer/disko-golden.nix`, auto-detects hardware via `hardware-db.sh`,
+  `installer/disko-config.nix`, auto-detects hardware via `hardware-db.sh`,
   runs `home-manager switch` inside `nixos-enter` so the first login is
   fully themed).
 - `sudo /etc/install.sh --dry-run` — generate the flake into a tmpdir and

docs/OPTIONS.md

@@ -89,7 +89,7 @@ Wired in `features/desktop/waybar/default.nix` (filters the battery widget out o
 
 ### `nomarchy.system.gaming.enable`
 
-`bool`, default `false`. Gaming preset: enables `programs.steam` (with `remotePlay` and `localNetworkGameTransfers` firewall holes opened by `mkDefault`), `programs.gamemode` (the launching user must be in the `gamemode` group), and `services.flatpak`. The flathub remote isn't added declaratively — after first boot, run `flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo`. The Hyprland fullscreen-on-Steam-launch window rule is a separate roadmap item.
+`bool`, default `false`. Gaming preset: enables `programs.steam` (with `remotePlay` and `localNetworkGameTransfers` firewall holes opened by `mkDefault`), `programs.gamemode` (the launching user must be in the `gamemode` group), and `services.flatpak`. The flathub remote isn't added declaratively — after first boot, run `flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo`. Pair with the home-side companion `nomarchy.gaming.enable` for the Hyprland fullscreen-on-Steam-launch window rule.
 
 ### `nomarchy.system.containers.enable`
 
@@ -243,6 +243,10 @@ Wired in `features/desktop/waybar/default.nix` (filters the battery widget out o
 
 `bool`, default `false`. opencode AI coding CLI integration. Deploys `~/.config/opencode/opencode.json`. The `opencode` package itself is **not** installed by Nomarchy — add it to your `home.packages`.
 
+### `nomarchy.gaming.enable`
+
+`bool`, default `false`. Home-side companion to `nomarchy.system.gaming.enable`. Adds a Hyprland `windowrulev2 = fullscreen, class:^(steam_app_).*$` so games launched through Steam grab the whole screen instead of opening windowed. Set to the same value as the system option; the installer flips both when the Gaming profile is selected.
+
 ### `nomarchy.vscode.devExtensions`
 
 `bool`, default `false`. Install Nomarchy's curated VSCode extension pack (Nix, language servers, theme variants).

docs/ROADMAP.md

@@ -24,7 +24,6 @@ Guardrails (apply when adding anything):
 ### Next (bigger lifts that build on Now)
 
 - **Accessibility — home-side companion.** Hyprland-side bits the system preset can't reach: slower `input.repeat_rate` / `repeat_delay` defaults, `SUPER+ALT+S` keybinding to launch Orca, and a high-contrast palette under `themes/palettes/`. Gated on a new `nomarchy.accessibility.enable` mirror of the system option.
-- **Gaming — Hyprland window rule.** Companion to the gaming preset: a Hyprland `windowrulev2 = fullscreen, class:^(steam_app_).*$` (or similar) so games launched from Steam grab the whole screen. Lives in `core/home/config/nomarchy/default/hypr/` and gates on a new `nomarchy.gaming.enable` mirror.
 - **Gaming — declarative flathub remote.** `services.flatpak.enable` doesn't ship a declarative remote API in nixpkgs. Either add the `flatpak-managed-install` overlay, write a one-shot systemd unit that runs `flatpak remote-add --if-not-exists flathub …`, or surface the manual step in `nomarchy-welcome`.
 - **Plymouth theme variants per palette.** Currently one Plymouth theme; could template per-palette so the boot splash matches the active theme.
 
@@ -137,6 +136,9 @@ Nomarchy is moving away from being a "flavor" of Omarchy to its own distinct ide
 
 (Move items here when they land — keep them brief, link the commit/PR.)
 
+- _2026-04-30_ — `set -e` sweep across `nomarchy-*` scripts. Added `set -e` to 142 of 169 bash scripts that lacked it (27 already had it). Halts a class of "command failed silently in the middle of a chain, system left in half-applied state" bugs that produced repeat-fix commits. One deliberate exception: `nomarchy-menu` runs without `set -e` because it's an interactive UX loop where action failures should re-display the menu rather than abort the script. Pre-commit hook now enforces `bash -n` + `shellcheck --severity=error` so future scripts can't regress this.
+- _2026-04-30_ — Installer disk-phase reliability. Hardened `installer/install.sh` and consolidated the disko configs: (1) `select_disk` now hides the live-ISO boot device(s) so the installer can't format its own boot media (`NOMARCHY_INSTALL_ALLOW_ISO_TARGET=1` to override); (2) added a 10 GiB minimum-capacity preflight; (3) `prewipe_target_drive` enumerates every active dm-crypt mapping backed by the target drive and closes them, drops the silent `|| true` from `wipefs`/`sgdisk`/`dd`, bounds `udevadm settle` to 30s, and refuses to continue if anything is still mounted; (4) wrapped the disko call in `run_disko_with_retry` with last-30-lines + Retry / View full log / Abort dialog on failure; (5) replaced the sed-templated `disko-golden.nix` + `disko-btrfs-multi.nix` pair with a single `disko-config.nix` Nix function called via `--argstr mainDrive … --arg extraDrives '[…]'` — eliminates a class of escaping bugs (cf. `3aadc36`); (6) added an EXIT trap so the tmpfs LUKS key file is removed even on early abort.
+- _2026-04-30_ — Gaming home-side companion. New `nomarchy.gaming.enable` option (mirror of `nomarchy.system.gaming.enable`) and `core/home/gaming.nix` module that injects a Hyprland `windowrulev2 = fullscreen, class:^(steam_app_).*$` so Steam-launched games grab the whole screen. Closes the "Gaming — Hyprland window rule" Next-column row.
 - _2026-04-26_ — Default to highest resolution (`highres`) for monitors. Updated `features/desktop/hyprland/config/monitors.conf` and forced it in the live ISO (`nomarchy-live`) to resolve issues where some hardware would default to a low resolution (1024x768).
 - _2026-04-26_ — First-run welcome wizard (`nomarchy-welcome`). Extended from a one-shot greeter into a guided picker for theme, font, and panel position. Added Step 4 to generate a starter `home.nix` if missing. State is now persisted in `state.json` via `.welcome_done`. Added `nomarchy.panelPosition` option to Waybar.
 - _2026-04-26_ — Multi-disk BTRFS support in the installer. Added `installer/disko-btrfs-multi.nix` template and updated `installer/install.sh` to allow selecting multiple drives via `gum choose --no-limit`. Implements BTRFS "single" data + RAID1 metadata across multiple LUKS-encrypted drives.

docs/SCRIPTS.md

@@ -127,7 +127,7 @@ Phase B (per-batch PRs) refines those into `port-from-omarchy`,
 | `nomarchy-restart-waybar` | `features/scripts/utils` | core/home/config/nomarchy-skill/SKILL.md,features/scripts/utils/nomarchy-menu, +4 more | `kept` |  |
 | `nomarchy-restart-wifi` | `core/system/scripts` | features/scripts/utils/nomarchy-menu | `kept` |  |
 | `nomarchy-restart-xcompose` | `core/system/scripts` | features/scripts/utils/nomarchy-menu | `kept` |  |
-| `nomarchy-rollback` | `features/scripts/utils` | installer/disko-golden.nix | `kept` |  |
+| `nomarchy-rollback` | `features/scripts/utils` | — | `unused?` |  |
 | `nomarchy-setup-dns` | `core/system/scripts` | features/scripts/utils/nomarchy-menu | `kept` |  |
 | `nomarchy-setup-fido2` | `core/system/scripts` | features/scripts/utils/nomarchy-menu | `kept` |  |
 | `nomarchy-setup-fingerprint` | `core/system/scripts` | core/home/config/nomarchy-skill/SKILL.md,features/scripts/utils/nomarchy-menu | `kept` |  |
@@ -213,7 +213,7 @@ Tokens grepped from `core/`, `features/`, `themes/`, `installer/`, `hosts/`, `bi
 | `nomarchy-installer` | features/scripts/utils/nomarchy-build-iso,README.md | `missing` |
 | `nomarchy-launch` | core/home/config/nomarchy/default/hypr/bindings/clipboard.conf,core/home/config/nomarchy/default/hypr/bindings/utilities.conf, +24 more | `missing` |
 | `nomarchy-live` | features/scripts/utils/nomarchy-build-live-iso,features/scripts/utils/nomarchy-on-boot, +1 more | `missing` |
-| `nomarchy-luks` | installer/disko-btrfs-multi.nix,installer/disko-golden.nix, +1 more | `missing` |
+| `nomarchy-luks` | installer/disko-config.nix,installer/install.sh | `missing` |
 | `nomarchy-menu-rows` | bin/utils/nomarchy-docs-scripts,features/scripts/utils/nomarchy-docs-scripts | `missing` |
 | `nomarchy-nopasswd` | core/system/scripts/nomarchy-sudo-passwordless-toggle | `missing` |
 | `nomarchy-nopasswd-expire` | core/system/scripts/nomarchy-sudo-passwordless-toggle | `missing` |

docs/STRUCTURE.md

@@ -125,9 +125,8 @@ The `lib/` directory provides centralized logic and data structures to maintain
 
 ### `installer/` (Bootstrap)
 - **`install.sh`**: The interactive TTY-based installer. It handles disk partitioning, NixOS installation, and generating a clean "Downstream" flake for the user.
-- **`disko-golden.nix`**: The standard partition layout (BTRFS on top of LUKS2).
+- **`disko-config.nix`**: The disko partition layout (BTRFS on top of LUKS2). A Nix function of `{ mainDrive, extraDrives ? [] }` — single-disk path is `extraDrives = []`; multi-disk adds BTRFS `-d single -m raid1` across the extras. Invoked by `install.sh` via `disko --argstr mainDrive … --arg extraDrives '[…]'`.
-- **`disko-btrfs-multi.nix`**: Multi-disk BTRFS RAID/Single layout template.
+- **`disko-btrfs-luks.nix`**: A simpler reference layout for disk management (not used by the installer).
-- **`disko-btrfs-luks.nix`**: A simpler reference layout for disk management.
 
 ### `hosts/` (Targets)
 - **`nomarchy-installer.nix`**: Configuration for the minimal, TTY-based installation ISO.

features/scripts/utils/nomarchy-backup

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -e
 
 # Nomarchy Backup Script
 # Alias for nomarchy-sync push.

features/scripts/utils/nomarchy-build-iso

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -e
 
 # Build the Nomarchy Installer ISO declaratively using the flake.
 

features/scripts/utils/nomarchy-build-live-iso

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -e
 
 # Build the Nomarchy Live ISO (Full Desktop Environment) using the flake.
 

features/scripts/utils/nomarchy-cmd-audio-switch

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Switch between audio outputs while preserving the mute status. By default mapped to Super + Mute.
 

features/scripts/utils/nomarchy-cmd-present

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Returns true if all the commands passed in as arguments exit on the system.
 

features/scripts/utils/nomarchy-cmd-screenrecord

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Start and stop a screenrecording, which will be saved to ~/Videos by default.
 # Alternative location can be set via NOMARCHY_SCREENRECORD_DIR or XDG_VIDEOS_DIR ENVs.

features/scripts/utils/nomarchy-cmd-screensaver

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Run the Nomarchy screensaver using random effects from TTE.
 

features/scripts/utils/nomarchy-cmd-screenshot

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Take a screenshot of the whole screen, a specific window, or a user-drawn region.
 # Saves to ~/Pictures by default, but that can be changed via NOMARCHY_SCREENSHOT_DIR or XDG_PICTURES_DIR ENVs.

features/scripts/utils/nomarchy-cmd-share

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Share clipboard, file, or folder using LocalSend. Bound to Super + Ctrl + S by default.
 

features/scripts/utils/nomarchy-cmd-terminal-cwd

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Returns the current working directory of the active terminal window,
 # so a new terminal window can be started in the same directory.

features/scripts/utils/nomarchy-config-direct-boot

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Add an EFI boot entry for the Nomarchy UKI, allowing the system to boot directly
 # without a bootloader like Limine. Requires UEFI firmware and a built UKI.

features/scripts/utils/nomarchy-docs-scripts

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -e
 # Generator tolerates "no matches" exit codes from grep | sort.
 # pipefail and -e off; -u stays.
 set -u

features/scripts/utils/nomarchy-drive-info

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Returns drive information about a given volumne, like /dev/nvme0, which is used by nomarchy-drive-select.
 

features/scripts/utils/nomarchy-drive-select

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Select a drive from a list with info that includes space and brand. Used by nomarchy-drive-set-password.
 

features/scripts/utils/nomarchy-drive-set-password

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Set a new encryption password for a drive selected.
 

features/scripts/utils/nomarchy-font

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -e
 
 # Nomarchy Font Helper
 # Usage: nomarchy-font [selector|set <name>|list]

features/scripts/utils/nomarchy-hyprland-active-window-transparency-toggle

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Toggles transparency for the currently focused window.
 

features/scripts/utils/nomarchy-hyprland-monitor-scaling-cycle

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Get the active monitor (the one with the cursor)
 MONITOR_INFO=$(hyprctl monitors -j | jq -r '.[] | select(.focused == true)')

features/scripts/utils/nomarchy-hyprland-window-close-all

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Close all open windows
 hyprctl clients -j | \

features/scripts/utils/nomarchy-hyprland-window-gaps-toggle

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -e
 
 # Toggles the window gaps globally between no gaps and the default 10/5/2, declaratively and instantly.
 

features/scripts/utils/nomarchy-hyprland-window-pop

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Toggle to pop-out a tile to stay fixed on a display basis.
 

features/scripts/utils/nomarchy-hyprland-window-single-square-aspect-toggle

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Check current single_window_aspect_ratio setting
 CURRENT_VALUE=$(hyprctl getoption "layout:single_window_aspect_ratio" 2>/dev/null | head -1)

features/scripts/utils/nomarchy-hyprland-workspace-layout-toggle

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Toggle the layout on the current active workspace between dwindle and scrolling
 

features/scripts/utils/nomarchy-install

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -e
 
 # Nomarchy Install Script
 # Entry point for the Nomarchy installer.

features/scripts/utils/nomarchy-install-docker-dbs

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -e
 
 # Nomarchy Docker DBs Stub
 # This script is a stub for a specialized tool.

features/scripts/utils/nomarchy-launch-about

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Launch the fastfetch TUI that gives information about the current system.
 

features/scripts/utils/nomarchy-launch-audio

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Launch the Nomarchy audio controls TUI (provided by wiremix).
 

features/scripts/utils/nomarchy-launch-bluetooth

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Launch the Nomarchy bluetooth controls TUI (provided by bluetui).
 # Also attempts to unblock bluetooth service if rfkill had blocked it.

features/scripts/utils/nomarchy-launch-browser

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Launch the default browser as determined by xdg-settings.
 # Automatically converts --private into the correct flag for the given browser.

features/scripts/utils/nomarchy-launch-editor

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Launch the default editor as determined by $EDITOR (set via ~/.config/uwsm/default) (or nvim if missing).
 # Starts suitable editors in a terminal window and otherwise as a regular application.

features/scripts/utils/nomarchy-launch-floating-terminal-with-presentation

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Launch a floating terminal with the Nomarchy logo presentation, then execute the command passed in, and finally end with the nomarchy-show-done presentation.
 # Used by actions such as Update System.

features/scripts/utils/nomarchy-launch-or-focus

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Launch or focus on a given command identified by the passed in window-pattern.
 # Use by some default bindings, like the one for Spotify, to ensure there is only one instance of the application open.

features/scripts/utils/nomarchy-launch-or-focus-tui

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Launch or focus on a given TUI identified by the passed in as the command.
 # Use by commands like nomarchy-launch-wifi to ensure there is only one wifi configuration screen open.

features/scripts/utils/nomarchy-launch-or-focus-webapp

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Launch or focus on a given web app identified by the window-pattern.
 # Use by some default bindings, like the one for WhatsApp, to ensure there is only one instance of the application open.

features/scripts/utils/nomarchy-launch-screensaver

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Launch the Nomarchy screensaver in the default terminal on the system with the correct font configuration.
 

features/scripts/utils/nomarchy-launch-tui

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Launch the TUI command passed in as an argument in the default terminal with an org.nomarchy.COMMAND app id for styling.
 

features/scripts/utils/nomarchy-launch-walker

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Wrapper to launch walker with elephant provider, or fallback to rofi if walker is missing.
 

features/scripts/utils/nomarchy-launch-webapp

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Launch the passed in URL as a web app in the default browser (or chromium if the default doesn't support --app).
 

features/scripts/utils/nomarchy-launch-wifi

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Launch the Nomarchy wifi controls (provided by the Impala TUI).
 # Attempts to unblock the wifi service first in case it should be been blocked.

features/scripts/utils/nomarchy-lock-screen

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Locks the system using hyprlock, but not before ensuring 1password has also been locked, and the screensaver stopped.
 

features/scripts/utils/nomarchy-manual

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -e
 
 # Nomarchy Manual Script
 # Opens the Nomarchy manual in the default web browser.

features/scripts/utils/nomarchy-menu

@@ -1,6 +1,12 @@
 #!/bin/bash
 
 # Launch the Nomarchy Menu or takes a parameter to jump straight to a submenu.
+#
+# Deliberately runs WITHOUT `set -e`: this is an interactive UX loop, and
+# 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 (the menu re-displays, the user picks again) is the right
+# semantic here.
 
 export PATH="$HOME/.local/share/nomarchy/bin:$PATH"
 
@@ -66,7 +72,7 @@ show_learn_menu() {
   *Arch*) nomarchy-launch-webapp "https://wiki.archlinux.org/title/Main_page" ;;
   *Bash*) nomarchy-launch-webapp "https://devhints.io/bash" ;;
   *Neovim*) nomarchy-launch-webapp "https://www.lazyvim.org/keymaps" ;;
-  *) show_main_menu ;;
+  *) back_to show_main_menu ;;
   esac
 }
 
@@ -76,7 +82,7 @@ show_trigger_menu() {
   *Share*) show_share_menu ;;
   *Toggle*) show_toggle_menu ;;
   *Hardware*) show_hardware_menu ;;
-  *) show_main_menu ;;
+  *) back_to show_main_menu ;;
   esac
 }
 
@@ -146,14 +152,14 @@ show_share_menu() {
 show_toggle_menu() {
   case $(menu "Toggle" "󱄄  Screensaver\n󰔎  Nightlight\n󱫖  Idle Lock\n󰍜  Top Bar\n󱂬  Workspace Layout\n  Window Gaps\n  1-Window Ratio\n󰍹  Display Scaling") in
 
-  *Screensaver*) nomarchy-toggle-screensaver ;;
+  *Screensaver*) nomarchy-toggle-screensaver; back_to show_toggle_menu ;;
-  *Nightlight*) nomarchy-toggle-nightlight ;;
+  *Nightlight*) nomarchy-toggle-nightlight; back_to show_toggle_menu ;;
-  *Idle*) nomarchy-toggle-idle ;;
+  *Idle*) nomarchy-toggle-idle; back_to show_toggle_menu ;;
-  *Bar*) nomarchy-toggle-waybar ;;
+  *Bar*) nomarchy-toggle-waybar; back_to show_toggle_menu ;;
-  *Layout*) nomarchy-hyprland-workspace-layout-toggle ;;
+  *Layout*) nomarchy-hyprland-workspace-layout-toggle; back_to show_toggle_menu ;;
-  *Ratio*) nomarchy-hyprland-window-single-square-aspect-toggle ;;
+  *Ratio*) nomarchy-hyprland-window-single-square-aspect-toggle; back_to show_toggle_menu ;;
-  *Gaps*) nomarchy-hyprland-window-gaps-toggle ;;
+  *Gaps*) nomarchy-hyprland-window-gaps-toggle; back_to show_toggle_menu ;;
-  *Scaling*) nomarchy-hyprland-monitor-scaling-cycle ;;
+  *Scaling*) nomarchy-hyprland-monitor-scaling-cycle; back_to show_toggle_menu ;;
   *) back_to show_trigger_menu ;;
   esac
 }
@@ -161,7 +167,7 @@ show_toggle_menu() {
 show_hardware_menu() {
   case $(menu "Toggle" "  Hybrid GPU") in
   *"Hybrid GPU"*) present_terminal nomarchy-toggle-hybrid-gpu ;;
-  *) show_trigger_menu ;;
+  *) back_to show_trigger_menu ;;
   esac
 }
 
@@ -173,16 +179,18 @@ show_style_menu() {
   *Hyprland*) open_in_editor ~/.config/hypr/looknfeel.conf ;;
   *Screensaver*) open_in_editor ~/.config/nomarchy/branding/screensaver.txt ;;
   *About*) open_in_editor ~/.config/nomarchy/branding/about.txt ;;
-  *) show_main_menu ;;
+  *) back_to show_main_menu ;;
   esac
 }
 
 show_theme_menu() {
   nomarchy-launch-walker -m menus:nomarchythemes --width 800 --minheight 400
+  back_to show_style_menu
 }
 
 show_background_menu() {
   nomarchy-launch-walker -m menus:nomarchyBackgroundSelector --width 800 --minheight 400
+  back_to show_style_menu
 }
 
 show_font_menu() {
@@ -191,6 +199,7 @@ show_font_menu() {
     back_to show_style_menu
   else
     nomarchy-font-set "$theme"
+    back_to show_font_menu
   fi
 }
 
@@ -212,7 +221,7 @@ show_setup_menu() {
   *DNS*) present_terminal nomarchy-setup-dns ;;
   *Security*) show_setup_security_menu ;;
   *Config*) show_setup_config_menu ;;
-  *) show_main_menu ;;
+  *) back_to show_main_menu ;;
   esac
 }
 
@@ -223,6 +232,7 @@ show_setup_power_menu() {
     back_to show_setup_menu
   else
     powerprofilesctl set "$profile"
+    back_to show_setup_power_menu
   fi
 }
 
@@ -230,7 +240,7 @@ show_setup_security_menu() {
   case $(menu "Setup" "󰈷  Fingerprint\n  Fido2") in
   *Fingerprint*) present_terminal nomarchy-setup-fingerprint ;;
   *Fido2*) present_terminal nomarchy-setup-fido2 ;;
-  *) show_setup_menu ;;
+  *) back_to show_setup_menu ;;
   esac
 }
 
@@ -246,7 +256,7 @@ show_setup_config_menu() {
   *Waybar*) open_in_editor ~/.config/waybar/config.jsonc && nomarchy-restart-waybar ;;
   *XCompose*) open_in_editor ~/.XCompose && nomarchy-restart-xcompose ;;
   *Overrides*) xdg-open ~/.config/nomarchy/overrides/ ;;
-  *) show_setup_menu ;;
+  *) back_to show_setup_menu ;;
   esac
 }
 
@@ -266,10 +276,10 @@ show_setup_system_menu() {
   fi
 
   case $(menu "System" "$options") in
-  *Suspend*) nomarchy-toggle-suspend ;;
+  *Suspend*) nomarchy-toggle-suspend; back_to show_setup_system_menu ;;
   *"Enable Hibernate"*) present_terminal nomarchy-hibernation-setup ;;
   *"Disable Hibernate"*) present_terminal nomarchy-hibernation-remove ;;
-  *) show_setup_menu ;;
+  *) back_to show_setup_menu ;;
   esac
 }
 
@@ -285,17 +295,17 @@ show_update_menu() {
   *Timezone*) present_terminal nomarchy-tz-select ;;
   *Time*) present_terminal nomarchy-update-time ;;
   *Password*) show_update_password_menu ;;
-  *) show_main_menu ;;
+  *) back_to show_main_menu ;;
   esac
 }
 show_update_process_menu() {
   case $(menu "Restart" "  Hypridle\n  Hyprsunset\n  Swayosd\n󰌧  Walker\n󰍜  Waybar") in
-  *Hypridle*) nomarchy-restart-hypridle ;;
+  *Hypridle*) nomarchy-restart-hypridle; back_to show_update_process_menu ;;
-  *Hyprsunset*) nomarchy-restart-hyprsunset ;;
+  *Hyprsunset*) nomarchy-restart-hyprsunset; back_to show_update_process_menu ;;
-  *Swayosd*) nomarchy-restart-swayosd ;;
+  *Swayosd*) nomarchy-restart-swayosd; back_to show_update_process_menu ;;
-  *Walker*) nomarchy-restart-walker ;;
+  *Walker*) nomarchy-restart-walker; back_to show_update_process_menu ;;
-  *Waybar*) nomarchy-restart-waybar ;;
+  *Waybar*) nomarchy-restart-waybar; back_to show_update_process_menu ;;
-  *) show_update_menu ;;
+  *) back_to show_update_menu ;;
   esac
 }
 
@@ -306,7 +316,7 @@ show_update_hardware_menu() {
   *Audio*) present_terminal nomarchy-restart-pipewire ;;
   *Wi-Fi*) present_terminal nomarchy-restart-wifi ;;
   *Bluetooth*) present_terminal nomarchy-restart-bluetooth ;;
-  *) show_update_menu ;;
+  *) back_to show_update_menu ;;
   esac
 }
 
@@ -314,7 +324,7 @@ show_update_password_menu() {
   case $(menu "Update Password" "  Drive Encryption\n  User") in
   *Drive*) present_terminal nomarchy-drive-set-password ;;
   *User*) present_terminal passwd ;;
-  *) show_update_menu ;;
+  *) back_to show_update_menu ;;
   esac
 }
 

features/scripts/utils/nomarchy-menu-keybindings

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Display Hyprland keybindings defined in your configuration using walker for an interactive search menu.
 

features/scripts/utils/nomarchy-notification-dismiss

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Dismiss a mako notification on the basis of its summary. Used by the first-run notifications to dismiss them after clicking for action.
 

features/scripts/utils/nomarchy-npx-install

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Install an npx wrapper for a given npm package.
 # Usage: nomarchy-npx-install <package> [command-name]

features/scripts/utils/nomarchy-on-boot

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -e
 
 # Nomarchy on-boot initialization script.
 # Automatically detects the hardware, applies necessary runtime tweaks,

features/scripts/utils/nomarchy-pkg-aur-add

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -e
 
 # Nomarchy AUR Stub
 # Informs the user that AUR is not applicable to NixOS.

features/scripts/utils/nomarchy-pkg-drop

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -e
 
 # Nomarchy Package Drop Script
 # Alias for nomarchy-pkg-remove.

features/scripts/utils/nomarchy-pkg-install

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -e
 
 # Nomarchy Package Install Script
 # Alias for nomarchy-pkg-add for users coming from other distros.

features/scripts/utils/nomarchy-refresh-config

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # nomarchy-refresh-config: Restore a specific configuration file to its stock version.
 # Usage: nomarchy-refresh-config <relative-path-to-config>