- Update lib/state-schema.nix to default both home and system themes to 'summer-night'.
- Fix 'nomarchy-theme-list' and 'nomarchy-theme-set-templates' to resolve themes and templates from '~/.local/share/nomarchy' instead of the obsolete '$NOMARCHY_PATH' (fixing failures on Live ISO).
- Update 'nomarchy-welcome' to properly convert Title Case theme display names back to kebab-case identifiers and add input validation to prevent crashes.
- Fix installer impermanence symlink by using a relative path ('../persist/etc/nixos'), ensuring it resolves during 'nixos-install' both inside and outside the chroot.
- Deploy '~/.XCompose' symlink via Home Manager and add 'nomarchy-restart-xcompose' to the menu.
- Relocate 'Nomarchy.ttf' to 'core/branding/' and move user-level scripts ('pkg-add', 'pkg-remove', 'env-update', 'preflight-migration') to 'features/scripts/utils/' to align with the distro architecture.
- Remove obsolete '$NOMARCHY_PATH' exports and redundant 'bashrc' template.
- Export theme templates via 'xdg.dataFile' for script accessibility.
116 lines
3.4 KiB
Bash
Executable File
116 lines
3.4 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 ""
|
|
|
|
# 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. Starter home.nix
|
|
echo ""
|
|
echo "Step 4: Starter home.nix"
|
|
HOME_NIX="$HOME/.config/home-manager/home.nix"
|
|
if [ ! -f "$HOME_NIX" ]; then
|
|
echo "It looks like you don't have a ~/.config/home-manager/home.nix file yet."
|
|
echo "Nomarchy uses this file to manage your user-level packages and settings."
|
|
if gum confirm "Would you like to generate a starter home.nix?"; then
|
|
mkdir -p "$(dirname "$HOME_NIX")"
|
|
cat <<EOF > "$HOME_NIX"
|
|
{ pkgs, ... }:
|
|
{
|
|
# Nomarchy starter home.nix
|
|
# Add your user packages here.
|
|
home.packages = with pkgs; [
|
|
btop
|
|
fastfetch
|
|
chromium
|
|
# Add more packages here
|
|
];
|
|
|
|
# home.stateVersion = "25.11"; # Consult docs/MIGRATION.md if you change this
|
|
}
|
|
EOF
|
|
echo "Starter home.nix generated at $HOME_NIX"
|
|
fi
|
|
else
|
|
echo "Detected existing home.nix at $HOME_NIX. Skipping generation."
|
|
fi
|
|
|
|
# 5. Setup Local Repo (Crucial for nomarchy-env-update to work)
|
|
echo ""
|
|
echo "Step 5: 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
|
|
|
|
# 6. 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
|