0f22c48c45
New nomarchy-installed-summary script renders a markdown table via gum format with the install shape the user should verify before they start customising: - theme / font / panel position (~/.config/nomarchy/state.json) - timezone / DNS / hybrid GPU (/etc/nixos/state.json) - form factor (BAT* sysfs presence) - software profiles (presence of marker packages) - FDE (any crypt entry in lsblk) - drives (lsblk filtered to disk/part/crypt) nomarchy-welcome calls it as Step 0 — before the theme/font/panel pickers — and gates progression on a gum input prompt so the user has to acknowledge before customisation rewrites anything. The script is also callable standalone from any terminal: `nomarchy-installed-summary`. Self-contained — no installer-side changes. Software profiles are detected heuristically (the installer bakes the user's pick into the generated home.nix as concrete home.packages rather than persisting a profile list), which is good enough for verification but won't catch manually-removed profile packages. gum is in the existing categoryDeps so no new tools are needed; falls back to plain markdown when gum isn't on PATH (recovery contexts). Closes the "Installer: What's installed? summary on first boot" Now-column item from Pillar 4.
94 lines
2.9 KiB
Bash
Executable File
94 lines
2.9 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
set -e
|
|
|
|
STATE_FILE="$HOME/.config/nomarchy/state.json"
|
|
|
|
# Check if welcome wizard has already been completed
|
|
if [ -f "$STATE_FILE" ]; then
|
|
DONE=$(jq -r '.welcome_done' "$STATE_FILE" 2>/dev/null)
|
|
if [ "$DONE" == "true" ]; then
|
|
exit 0
|
|
fi
|
|
fi
|
|
|
|
# Ensure we have a terminal for the wizard
|
|
if [ -z "$TERMINAL_WIZARD" ]; then
|
|
export TERMINAL_WIZARD=1
|
|
alacritty -e "$0"
|
|
exit 0
|
|
fi
|
|
|
|
gum style \
|
|
--foreground 212 --border-foreground 212 --border double \
|
|
--align center --width 50 --margin "1 2" --padding "2 4" \
|
|
"Nomarchy" "The Professional NixOS Desktop"
|
|
|
|
echo "Welcome! Let's personalize your new system."
|
|
echo ""
|
|
|
|
# 0. Show what the installer actually wrote so the user can verify the
|
|
# install shape (theme, font, profiles, drives, FDE, form factor) before
|
|
# diving into customisation. Available standalone via the same command.
|
|
nomarchy-installed-summary
|
|
echo ""
|
|
gum input --placeholder "Press Enter to continue with customisation…" >/dev/null || true
|
|
echo ""
|
|
|
|
# 1. Select initial theme
|
|
echo "Step 1: Choose your starting theme"
|
|
SELECTED_THEME="$(nomarchy-theme-list | gum filter --placeholder 'Select a theme...')"
|
|
if [[ -n "$SELECTED_THEME" ]]; then
|
|
THEME_ID=$(echo "$SELECTED_THEME" | tr '[:upper:]' '[:lower:]' | tr ' ' '-')
|
|
nomarchy-theme-set "$THEME_ID" --no-update
|
|
fi
|
|
|
|
# 2. Select initial font
|
|
echo "Step 2: Choose your preferred font"
|
|
SELECTED_FONT="$(nomarchy-font-list | gum filter --placeholder 'Select a font...')"
|
|
if [[ -n "$SELECTED_FONT" ]]; then
|
|
nomarchy-font-set "$SELECTED_FONT" --no-update
|
|
fi
|
|
|
|
# 3. Select panel position
|
|
echo "Step 3: Choose your preferred panel position"
|
|
POSITION=$(gum choose "top" "bottom")
|
|
if [[ -n "$POSITION" ]]; then
|
|
nomarchy-state-write panelPosition "$POSITION"
|
|
fi
|
|
|
|
# Skip system-modifying steps in the Live ISO environment
|
|
if [[ "$USER" == "nixos" ]]; then
|
|
echo ""
|
|
echo "Live ISO detected. Skipping home.nix generation and git repo check."
|
|
nomarchy-env-update
|
|
nomarchy-state-write welcome_done true --type bool
|
|
gum style --foreground 82 "Setup complete! Enjoy your Nomarchy experience."
|
|
sleep 3
|
|
exit 0
|
|
fi
|
|
|
|
# 4. Setup Local Repo (Crucial for nomarchy-env-update to work)
|
|
echo ""
|
|
echo "Step 4: Git Repository Check"
|
|
echo "Nomarchy relies on a local git repository for declarative updates."
|
|
if [ ! -d "/etc/nixos/.git" ]; then
|
|
echo "Warning: /etc/nixos is not a git repository. Declarative updates might fail."
|
|
if gum confirm "Would you like to initialize /etc/nixos as a git repo?"; then
|
|
sudo git -C /etc/nixos init
|
|
sudo git -C /etc/nixos add .
|
|
sudo git -C /etc/nixos commit -m "Initial Nomarchy System Commit"
|
|
fi
|
|
fi
|
|
|
|
# 5. Success
|
|
echo ""
|
|
echo "Applying all changes..."
|
|
nomarchy-env-update
|
|
nomarchy-state-write welcome_done true --type bool
|
|
|
|
# Remove legacy flag file if it exists
|
|
rm -f "$HOME/.config/nomarchy/.first-run-done"
|
|
|
|
gum style --foreground 82 "Setup complete! Enjoy your Nomarchy experience."
|
|
sleep 3
|