fix: ground + fix three Pillar-9 candidate bugs from the script sweep

All three confirmed real on inspection. 1. nomarchy-refresh-config was dead on every system: it read /etc/nixos/nomarchy/{core/home/config,features} (the source tree never lands there — only /etc/nomarchy on VM-guest/live ISO) and fell back to ~/.local/share/nomarchy/config, which nothing deployed despite SKILL.md documenting it. Deploy the pristine core/home/config tree to ~/.local/share/nomarchy/config via xdg.dataFile and read from there, so it works without a source checkout; its live caller nomarchy-refresh-fastfetch now succeeds. Fix two stale SKILL.md examples (waybar/, hypr/) that pointed at non-existent stock paths. 2. nomarchy-docs-scripts shipped a stale divergent copy in features/scripts/utils/ (in the user nomarchy-system-scripts package) beside the canonical bin/utils dev tool — it errored outside the repo. Grounding it surfaced the identical bug in nomarchy-docs-keybindings. Delete both duplicates, add them to the generator's self-reference denylist so they don't show as false `missing`, regenerate docs/SCRIPTS.md. 3. Home ~/.config/nomarchy/state.json was never seeded on non-installer systems, so nomarchy-installed-summary rendered "—" for theme/font/panel. Add an idempotent home-manager activation seed in core/home/state.nix that backfills the resolved values (defaults * existing — user choices and runtime-only keys like welcome_done always win). Verified: flake check + full eval matrix clean; refresh-config happy/error paths and the seed deep-merge proven by hand. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
2026-05-31 14:25:02 +01:00
parent 00b8214cb1
commit 0fbc3d9c82
9 changed files with 75 additions and 433 deletions
--- a/features/scripts/utils/nomarchy-docs-keybindings
+++ b/features/scripts/utils/nomarchy-docs-keybindings
@@ -1,110 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-# nomarchy-docs-keybindings
-#
-# Regenerates docs/KEYBINDINGS.md from the Hyprland binding files. Run from the
-# repo root or anywhere — paths are resolved relative to this script.
-#
-#   nomarchy-docs-keybindings                       # write to stdout
-#   nomarchy-docs-keybindings --out docs/KEYBINDINGS.md
-#
-# Source files in render order. Each entry is "<repo-relative path>|<title>".
-
-repo_root="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
-
-sources=(
-  "core/home/config/nomarchy/default/hypr/bindings/utilities.conf|Utilities"
-  "core/home/config/nomarchy/default/hypr/bindings/tiling.conf|Tiling"
-  "core/home/config/nomarchy/default/hypr/bindings/tiling-v2.conf|Tiling (v2)"
-  "core/home/config/nomarchy/default/hypr/bindings/clipboard.conf|Clipboard"
-  "core/home/config/nomarchy/default/hypr/bindings/media.conf|Media keys"
-  "features/desktop/hyprland/config/bindings.conf|Apps & web shortcuts"
-)
-
-prettify_key() {
-  case "$1" in
-    code:10) echo "1" ;; code:11) echo "2" ;; code:12) echo "3" ;;
-    code:13) echo "4" ;; code:14) echo "5" ;; code:15) echo "6" ;;
-    code:16) echo "7" ;; code:17) echo "8" ;; code:18) echo "9" ;;
-    code:19) echo "0" ;;
-    XF86AudioRaiseVolume)   echo "Volume Up" ;;
-    XF86AudioLowerVolume)   echo "Volume Down" ;;
-    XF86AudioMute)          echo "Mute" ;;
-    XF86AudioMicMute)       echo "Mic Mute" ;;
-    XF86AudioPlay)          echo "Play/Pause" ;;
-    XF86AudioStop)          echo "Stop" ;;
-    XF86AudioNext)          echo "Next Track" ;;
-    XF86AudioPrev)          echo "Previous Track" ;;
-    XF86MonBrightnessUp)    echo "Brightness Up" ;;
-    XF86MonBrightnessDown)  echo "Brightness Down" ;;
-    XF86KbdBrightnessUp)    echo "Kbd Brightness Up" ;;
-    XF86KbdBrightnessDown)  echo "Kbd Brightness Down" ;;
-    XF86KbdLightOnOff)      echo "Kbd Backlight" ;;
-    *) echo "$1" ;;
-  esac
-}
-
-trim() { sed -E 's/^[[:space:]]+//; s/[[:space:]]+$//'; }
-
-render_section() {
-  local file="$1" title="$2"
-  [[ ! -f "$repo_root/$file" ]] && return
-  local rows
-  rows=$(grep -E '^[[:space:]]*bind[a-z]*[[:space:]]*=' "$repo_root/$file" || true)
-  [[ -z "$rows" ]] && return
-
-  local body=""
-  while IFS= read -r line; do
-    # Strip the "bindXXX =" prefix.
-    local rhs="${line#*=}"
-    local mods key desc
-    IFS=',' read -r mods key desc _ <<<"$rhs"
-    mods=$(printf '%s' "${mods:-}" | trim)
-    key=$(printf '%s'  "${key:-}"  | trim)
-    desc=$(printf '%s' "${desc:-}" | trim)
-    [[ -z "$desc" ]] && continue          # skip non-descriptive bindings
-    [[ -z "$mods" ]] && mods="—"
-    key=$(prettify_key "$key")
-    body+=$(printf '| %s | %s | %s |\n' "$mods" "$key" "$desc")
-    body+=$'\n'
-  done <<<"$rows"
-
-  [[ -z "$body" ]] && return
-
-  printf '\n## %s\n\n' "$title"
-  printf '_Source: `%s`_\n\n' "$file"
-  printf '| Modifiers | Key | Action |\n'
-  printf '| --- | --- | --- |\n'
-  printf '%s' "$body"
-}
-
-main() {
-  cat <<'HEADER'
-# Nomarchy Keybindings
-
-Auto-generated from the Hyprland binding files. **Do not edit by hand.**
-Re-run the generator after changing any `bindings/*.conf`:
-
-```bash
-./bin/utils/nomarchy-docs-keybindings --out docs/KEYBINDINGS.md
-```
-
-`SUPER` is the Meta / Win key. `code:NN` keys (X11 digit keycodes) are
-shown as the digit they correspond to. Media keys (`XF86Audio*`,
-`XF86MonBrightness*`, …) are prettified.
-HEADER
-  for entry in "${sources[@]}"; do
-    render_section "${entry%|*}" "${entry#*|}"
-  done
-}
-
-out=""
-if [[ "${1:-}" == "--out" ]]; then
-  out="${2:?--out needs a path}"; shift 2
-fi
-if [[ -n "$out" ]]; then
-  main >"$out"
-else
-  main
-fi
--- a/features/scripts/utils/nomarchy-docs-scripts
+++ b/features/scripts/utils/nomarchy-docs-scripts
@@ -1,275 +0,0 @@
-#!/usr/bin/env bash
-set -e
-# Generator tolerates "no matches" exit codes from grep | sort.
-# pipefail and -e off; -u stays.
-set -u
-
-# nomarchy-docs-scripts
-#
-# Regenerates docs/SCRIPTS.md from the repo state. Produces:
-#   1. Header + status legend + regen instructions.
-#   2. Table of every nomarchy-* script (location, callers, status).
-#   3. Table of every menu entry in features/scripts/utils/nomarchy-menu
-#      (submenu, label, target command, status).
-#   4. Snapshot list of orphaned references (called somewhere, no script).
-#
-# Status heuristic in Phase A:
-#   kept     — file exists AND is called from at least one *.nix / *.conf /
-#              shell file outside its own directory.
-#   unused?  — file exists but no caller found. Phase B decides delete-dead
-#              vs intentional public API.
-#   missing  — referenced but no file. Phase B decides port-from-omarchy
-#              vs delete-dead vs stub-with-notify.
-#
-#   nomarchy-docs-scripts                       # write to stdout
-#   nomarchy-docs-scripts --out docs/SCRIPTS.md
-
-repo_root="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
-cd "$repo_root"
-
-# --- Inventory -------------------------------------------------------------
-
-# Where scripts live, in render order.
-declare -A loc_label=(
-  ["features/scripts/utils"]="features/scripts/utils"
-  ["core/system/scripts"]="core/system/scripts"
-  ["themes/engine/scripts"]="themes/engine/scripts"
-)
-script_dirs=(features/scripts/utils core/system/scripts themes/engine/scripts)
-
-# Build name → location map (associative array of basename → repo-relative dir).
-declare -A script_loc
-for dir in "${script_dirs[@]}"; do
-  [[ -d "$dir" ]] || continue
-  while IFS= read -r f; do
-    script_loc["$(basename "$f")"]="$dir"
-  done < <(find "$dir" -maxdepth 1 -type f -name 'nomarchy-*')
-done
-
-# Find every nomarchy-* token referenced anywhere outside the script dirs.
-# (We exclude the script files themselves so they don't list themselves as
-# their own caller.)
-# File types we search for references. *.md catches docs and README;
-# branding/hook/extension files have varied or no extensions.
-# *.lua catches elephant providers; *.ini catches mako on-button-* hooks;
-# *.desktop catches MimeType-registered URL handlers.
-grep_includes=(
-  --include='*.nix' --include='*.conf' --include='*.sh' --include='*.md'
-  --include='nomarchy-*' --include='*.jsonc' --include='*.json'
-  --include='*.toml' --include='*.ini' --include='*.lua'
-  --include='*.desktop' --include='*.txt' --include='*.sample'
-)
-search_dirs=(core features themes installer hosts bin lib README.md)
-
-# Files whose mentions of nomarchy-* are documentation about the scripts,
-# not real callers. Excluded from caller discovery so they don't promote
-# every script to `kept`.
-self_refs=(docs/SCRIPTS.md docs/ROADMAP.md docs/AGENT.md)
-
-ref_files_per_cmd() {
-  local cmd="$1"
-  local self_pattern
-  self_pattern=$(IFS='|'; echo "${self_refs[*]}")
-  grep -rlE "\\b${cmd}\\b" \
-    "${grep_includes[@]}" \
-    "${search_dirs[@]}" 2>/dev/null \
-    | grep -vE "^(features/scripts/utils|core/system/scripts|themes/engine/scripts)/${cmd}$" \
-    | grep -vE "^(${self_pattern})$" \
-    | sort -u
-}
-
-# All distinct nomarchy-* tokens we see anywhere in the repo.
-# Final char must be alphanumeric — dropping trailing-dash matches like
-# `nomarchy-pkg-` that come from glob references (`for c in nomarchy-pkg-*`).
-# Restrict to grep_includes so binaries / tmpfiles don't pollute the set.
-# The middle `grep -vE` drops lines where `nomarchy-*` is a derivation /
-# tmp file / sudoers basename / systemd unit / flake output / docker
-# container identifier — not a shell invocation — so they don't show up
-# as fake "missing" references.
-all_refs=$(grep -rhE 'nomarchy-[a-z0-9]([a-z0-9-]*[a-z0-9])?' \
-            "${grep_includes[@]}" \
-            "${search_dirs[@]}" 2>/dev/null \
-          | grep -vE \
-              -e '(pname|name)[[:space:]]*=[[:space:]]*"nomarchy-' \
-              -e '/tmp/nomarchy-' \
-              -e '/etc/sudoers\.d/[^"[:space:]]*nomarchy-' \
-              -e 'nixosConfigurations\.nomarchy-' \
-              -e 'packages\.[^.]+\.nomarchy-' \
-              -e '\./result/bin/run-nomarchy-' \
-              -e 'mktemp[[:space:]]+[^|]*-t[[:space:]]+nomarchy-' \
-              -e '(TIMER_NAME|NOPASSWD_FILE|UNIT_NAME)=.*nomarchy-' \
-              -e 'docker[[:space:]]+[^|]*nomarchy-' \
-          | grep -oE 'nomarchy-[a-z0-9]([a-z0-9-]*[a-z0-9])?' \
-          | grep -vE '^(nomarchy-plymouth|nomarchy-sddm-theme|nomarchy-live|nomarchy-rev|nomarchy-windows)$' \
-          | sort -u)
-# The token-level denylist above covers identifiers whose ambiguity survives
-# the line filter: `nomarchy-plymouth` / `nomarchy-sddm-theme` are Nix
-# derivation names referenced as bare idents in `[...]` lists,
-# `nomarchy-live` is an ISO label that shows up in comments, `nomarchy-rev`
-# is `/etc/nomarchy-rev` (a file written by the ISO), and
-# `nomarchy-windows` is a docker container name in compose heredocs.
-
-# --- Render: header --------------------------------------------------------
-
-main() {
-  cat <<'HEADER'
-# Nomarchy Script & Menu Audit
-
-Auto-generated table for [Pillar 3 of the roadmap](ROADMAP.md#3-pillar-script--menu-audit).
-**Do not edit by hand.** Regenerate after script or menu changes:
-
-```bash
-./bin/utils/nomarchy-docs-scripts --out docs/SCRIPTS.md
-```
-
-The status column uses a Phase A heuristic — `kept` / `unused?` / `missing`.
-Phase B (per-batch PRs) refines those into `port-from-omarchy`,
-`delete-dead`, or `stub-with-notify` and updates the rows.
-
-## Status legend
-
- `kept` — script exists and is called from somewhere outside its own directory.
- `unused?` — script exists but no caller was found. Could be dead, could be
-  intentional public API. Phase B triage decides.
- `missing` — referenced from code but no script file exists. Phase B triage
-  decides whether to port from Omarchy upstream, delete the caller, or stub
-  with `notify-send`.
- `port-from-omarchy` — Phase B verdict: lift the upstream Omarchy script,
-  rewrite for NixOS paths.
- `delete-dead` — Phase B verdict: remove and update callers.
- `stub-with-notify` — Phase B verdict: temporary `notify-send` stub.
-
-HEADER
-
-  # --- Render: scripts table ----------------------------------------------
-  printf '## Scripts (%d)\n\n' "${#script_loc[@]}"
-  printf '| Script | Location | Callers | Status | Notes |\n'
-  printf '| --- | --- | --- | --- | --- |\n'
-
-  # Sort scripts by name.
-  for name in $(printf '%s\n' "${!script_loc[@]}" | sort); do
-    local dir="${script_loc[$name]}"
-    local callers status callers_str
-    callers=$(ref_files_per_cmd "$name")
-    if [[ -z "$callers" ]]; then
-      status='`unused?`'
-      callers_str='—'
-    else
-      status='`kept`'
-      # Trim caller list to 2 entries + count.
-      local count
-      count=$(printf '%s\n' "$callers" | wc -l)
-      if (( count > 2 )); then
-        callers_str=$(printf '%s\n' "$callers" | head -2 | paste -sd, -)
-        callers_str="$callers_str, +$((count - 2)) more"
-      else
-        callers_str=$(printf '%s\n' "$callers" | paste -sd, -)
-      fi
-    fi
-    printf '| `%s` | `%s` | %s | %s |  |\n' \
-      "$name" "$dir" "$callers_str" "$status"
-  done
-  echo
-
-  # --- Render: missing references -----------------------------------------
-  printf '## Missing references\n\n'
-  printf 'Tokens grepped from `core/`, `features/`, `themes/`, `installer/`, `hosts/`, `bin/`, `lib/` that have no matching script file.\n\n'
-  printf '| Token | Referenced in | Status |\n'
-  printf '| --- | --- | --- |\n'
-  while IFS= read -r token; do
-    [[ -z "$token" ]] && continue
-    [[ -n "${script_loc[$token]:-}" ]] && continue
-    local refs
-    self_pattern=$(IFS='|'; echo "${self_refs[*]}")
-    refs=$(grep -rlE "\\b${token}\\b" \
-            "${grep_includes[@]}" \
-            "${search_dirs[@]}" 2>/dev/null \
-          | grep -vE "^(${self_pattern})$" \
-          | sort -u)
-    [[ -z "$refs" ]] && continue
-    local count refs_str
-    count=$(printf '%s\n' "$refs" | wc -l)
-    if (( count > 2 )); then
-      refs_str=$(printf '%s\n' "$refs" | head -2 | paste -sd, -)
-      refs_str="$refs_str, +$((count - 2)) more"
-    else
-      refs_str=$(printf '%s\n' "$refs" | paste -sd, -)
-    fi
-    printf '| `%s` | %s | `missing` |\n' "$token" "$refs_str"
-  done <<<"$all_refs"
-  echo
-
-  # --- Render: menu items -------------------------------------------------
-  printf '## Menu items\n\n'
-  printf 'Walked from `features/scripts/utils/nomarchy-menu`. Each `case` arm in a `show_*_menu` function becomes one row.\n\n'
-  printf '| Submenu | Entry | Calls | Status |\n'
-  printf '| --- | --- | --- | --- |\n'
-
-  awk '
-    /^show_[a-z_]+_menu\(\) {/ { sub(/\(\) {/, ""); current=$1; in_func=1; next }
-    /^[a-z_]+\(\) {/ && !/^show_/ { current=""; in_func=0; next }
-    /^}$/ { current=""; in_func=0; next }
-    !in_func { next }
-    /^  case \$\(menu / {
-      # extract the menu title between the first pair of double quotes
-      match($0, /menu "[^"]+" "[^"]+"/);
-      if (RSTART == 0) next;
-      title=substr($0, RSTART, RLENGTH);
-      # second quoted string is the option list
-      n=split(title, parts, "\"");
-      title=parts[2];
-      options=parts[4];
-      # split options on \n
-      split(options, opts, "\\\\n");
-      pending_submenu=current;
-      pending_title=title;
-      for (i=1;i<=length(opts);i++) pending_opts[i]=opts[i];
-      pending_count=length(opts);
-      next
-    }
-    /^  \*[A-Za-z]/ {
-      # case arm — extract pattern between the first * and the closing )
-      match($0, /\*[^)]*\)/);
-      if (RSTART == 0) next;
-      arm=substr($0, RSTART, RLENGTH);
-      gsub(/[*)]/, "", arm);
-      gsub(/^[[:space:]]+|[[:space:]]+$/, "", arm);
-      # action follows the )
-      rest=substr($0, RSTART+RLENGTH);
-      sub(/^[[:space:]]+/, "", rest);
-      sub(/[[:space:]]*;;[[:space:]]*$/, "", rest);
-      # match the first nomarchy-* token in the action
-      cmd=""
-      if (match(rest, /nomarchy-[a-z0-9-]+/)) {
-        cmd=substr(rest, RSTART, RLENGTH);
-      }
-      printf "%s|%s|%s\n", pending_submenu, arm, cmd;
-    }
-  ' features/scripts/utils/nomarchy-menu > /tmp/nomarchy-menu-rows.$$
-
-  while IFS='|' read -r submenu entry cmd; do
-    [[ -z "$entry" ]] && continue
-    [[ "$entry" =~ ^\) ]] && continue
-    status='`kept`'
-    if [[ -n "$cmd" ]]; then
-      if [[ -z "${script_loc[$cmd]:-}" ]]; then
-        status='`missing`'
-      fi
-    else
-      cmd='_(inline)_'
-    fi
-    printf '| `%s` | %s | `%s` | %s |\n' "$submenu" "$entry" "$cmd" "$status"
-  done < /tmp/nomarchy-menu-rows.$$
-  rm -f /tmp/nomarchy-menu-rows.$$
-  echo
-}
-
-out=""
-if [[ "${1:-}" == "--out" ]]; then
-  out="${2:?--out needs a path}"; shift 2
-fi
-if [[ -n "$out" ]]; then
-  main >"$out"
-else
-  main
-fi
--- a/features/scripts/utils/nomarchy-refresh-config
+++ b/features/scripts/utils/nomarchy-refresh-config
@@ -1,9 +1,13 @@
 #!/bin/bash
 set -e

-# nomarchy-refresh-config: Restore a specific configuration file to its stock version.
-# Usage: nomarchy-refresh-config <relative-path-to-config>
-# Example: nomarchy-refresh-config hypr/hyprland.conf
+# nomarchy-refresh-config: Restore a config file in ~/.config to its stock
+# version. The pristine copies live in ~/.local/share/nomarchy/config (deployed
+# by core/home/configs.nix), so this works on any system without needing the
+# flake source tree on disk.
+#
+# Usage: nomarchy-refresh-config <relative-path-under-~/.config>
+# Example: nomarchy-refresh-config fastfetch/config.jsonc

 CONFIG_FILE=$1

@@ -12,34 +16,17 @@ if [[ -z $CONFIG_FILE ]]; then
    exit 1
 fi

-# Determine source directory (where stock configs are stored)
-# In Nomarchy, we deploy them via Nix, but we also keep a copy in local share for easy access
-STOCK_DIR="$HOME/.local/share/nomarchy/themes" # Fallback if specific config isn't themed
-# Wait, actually we should use the one from /etc/nixos if available
-STOCK_BASE="/etc/nixos/nomarchy/core/home/config"
-
-if [ ! -d "$STOCK_BASE" ]; then
-    # Fallback to local share if /etc/nixos is not available
-    STOCK_BASE="$HOME/.local/share/nomarchy/config"
-fi
-
+STOCK_BASE="${XDG_DATA_HOME:-$HOME/.local/share}/nomarchy/config"
 SOURCE_FILE="$STOCK_BASE/$CONFIG_FILE"
-DEST_FILE="$HOME/.config/$CONFIG_FILE"
+DEST_FILE="${XDG_CONFIG_HOME:-$HOME/.config}/$CONFIG_FILE"

-if [ ! -f "$SOURCE_FILE" ]; then
-    # Try searching in features/ as well
-    STOCK_BASE="/etc/nixos/nomarchy/features"
-    # Find the file in features
-    SOURCE_FILE=$(find "$STOCK_BASE" -name "$(basename "$CONFIG_FILE")" | head -n 1)
-fi
-
-if [[ -n $SOURCE_FILE ]] && [[ -f "$SOURCE_FILE" ]]; then
-    echo "Refreshing $DEST_FILE from stock $SOURCE_FILE..."
-    mkdir -p "$(dirname "$DEST_FILE")"
-    cp "$SOURCE_FILE" "$DEST_FILE"
-    notify-send "Config Refreshed" "$CONFIG_FILE has been restored to defaults."
-else
-    echo "Error: Stock configuration for $CONFIG_FILE not found."
-    notify-send -u critical "Error" "Stock configuration for $CONFIG_FILE not found."
+if [[ ! -f "$SOURCE_FILE" ]]; then
+    echo "Error: Stock configuration for $CONFIG_FILE not found in $STOCK_BASE."
+    notify-send -u critical "Error" "No stock config for $CONFIG_FILE." 2>/dev/null || true
    exit 1
 fi
+
+echo "Refreshing $DEST_FILE from stock $SOURCE_FILE..."
+mkdir -p "$(dirname "$DEST_FILE")"
+cp "$SOURCE_FILE" "$DEST_FILE"
+notify-send "Config Refreshed" "$CONFIG_FILE has been restored to defaults." 2>/dev/null || true