0fbc3d9c82
All checks were successful
Check / eval-and-lint (push) Successful in 6m40s
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>
33 lines
1.1 KiB
Bash
Executable File
33 lines
1.1 KiB
Bash
Executable File
#!/bin/bash
|
|
set -e
|
|
|
|
# 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
|
|
|
|
if [[ -z $CONFIG_FILE ]]; then
|
|
echo "Usage: nomarchy-refresh-config <config-path>"
|
|
exit 1
|
|
fi
|
|
|
|
STOCK_BASE="${XDG_DATA_HOME:-$HOME/.local/share}/nomarchy/config"
|
|
SOURCE_FILE="$STOCK_BASE/$CONFIG_FILE"
|
|
DEST_FILE="${XDG_CONFIG_HOME:-$HOME/.config}/$CONFIG_FILE"
|
|
|
|
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
|