David Heinemeier HanssonandClaude Opus 5
425c3ff84d
omarchy-update-user-notify.path watched /usr/share/omarchy/migrations, but pacman writes that directory during every update, including the blessed omarchy update, which runs omarchy-migrate a step later. The watcher fired a critical notification for the migrations the update was already applying in the visible terminal. A watcher cannot tell that apart from a bypassed pacman -Syu, so the only trigger that never collides with a running update is a once-per-login check. The service that already ran at graphical-session.target is now the whole mechanism, renamed after the command it runs. That is also all the second-user case needs: markers are per-user, so anyone who did not run the update finds them missing at their next login. Login timing means the toast can be sent before the shell has claimed org.freedesktop.Notifications, so the notifier waits for a live server first. The wait is omarchy-first-run's, lifted into omarchy-notification-wait rather than duplicated. The package keeps omarchy-update-user-notify.service as a symlink onto the new unit. Existing users hold an absolute wants symlink to the old path, and the migration that repoints it only runs for users who run an update, which is the opposite of who the notifier is for. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
99 lines
2.7 KiB
Bash
Executable File
99 lines
2.7 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
# omarchy:summary=Finish first-login setup for Omarchy.
|
|
# omarchy:args=[--force]
|
|
|
|
set -e
|
|
|
|
usage() {
|
|
cat <<USAGE
|
|
Usage: omarchy-first-run [--force]
|
|
|
|
Run first-login user setup and notification hooks. By default this only runs
|
|
once per user. Use --force to rerun the full sequence and refresh user setup.
|
|
USAGE
|
|
}
|
|
|
|
force=0
|
|
finalize_user_args=()
|
|
while (($#)); do
|
|
case "$1" in
|
|
--force)
|
|
force=1
|
|
finalize_user_args+=(--force)
|
|
shift
|
|
;;
|
|
-h|--help)
|
|
usage
|
|
exit 0
|
|
;;
|
|
*)
|
|
echo "Unknown option: $1" >&2
|
|
usage >&2
|
|
exit 1
|
|
;;
|
|
esac
|
|
done
|
|
|
|
state_dir=~/.local/state/omarchy
|
|
FIRST_RUN_DONE="first-run-user"
|
|
if omarchy-done check "$FIRST_RUN_DONE" && (( force == 0 )); then
|
|
echo "First-run already complete (rerun with --force to refresh)."
|
|
exit 0
|
|
fi
|
|
|
|
omarchy-finalize-user "${finalize_user_args[@]}" || true
|
|
|
|
mkdir -p "$state_dir"
|
|
|
|
FIRST_RUN_LOG="$state_dir/first-run.log"
|
|
first_run_failed=0
|
|
|
|
log_first_run() {
|
|
printf '[%s] %s\n' "$(date '+%Y-%m-%d %H:%M:%S')" "$*" >>"$FIRST_RUN_LOG"
|
|
}
|
|
|
|
run_first_run_step() {
|
|
local name="$1"
|
|
shift
|
|
|
|
log_first_run "Starting: $name"
|
|
if "$@"; then
|
|
log_first_run "Completed: $name"
|
|
else
|
|
local status=$?
|
|
first_run_failed=1
|
|
log_first_run "Failed: $name (exit code: $status)"
|
|
fi
|
|
}
|
|
|
|
run_first_run_step "install Voxtype post-update hook" \
|
|
omarchy-hook-install post-update "$OMARCHY_PATH/install/user/first-run/install-voxtype.hook"
|
|
run_first_run_step "install fingerprint setup post-update hook" \
|
|
omarchy-hook-install post-update "$OMARCHY_PATH/install/user/first-run/setup-fingerprint.hook"
|
|
|
|
run_first_run_step "enable user systemd units" \
|
|
bash "$OMARCHY_PATH/install/user/first-run/enable-user-units.sh"
|
|
run_first_run_step "set GNOME theme" \
|
|
bash "$OMARCHY_PATH/install/user/first-run/gnome-theme.sh"
|
|
run_first_run_step "set GTK primary paste" \
|
|
bash "$OMARCHY_PATH/install/user/first-run/gtk-primary-paste.sh"
|
|
run_first_run_step "apply speaker tuning" \
|
|
bash "$OMARCHY_PATH/install/user/first-run/audio-tuning.sh"
|
|
|
|
omarchy-notification-wait || log_first_run "Timed out waiting for notification service; continuing"
|
|
run_first_run_step "show welcome notification" \
|
|
bash "$OMARCHY_PATH/install/user/first-run/welcome.sh"
|
|
# The first-run notification scripts register action callbacks in background
|
|
# notify-send processes. Give the notification server a tick to ingest the
|
|
# welcome toast before queueing the Wi-Fi/update toasts.
|
|
sleep 0.3
|
|
run_first_run_step "show Wi-Fi/update notifications" \
|
|
bash "$OMARCHY_PATH/install/user/first-run/wifi.sh"
|
|
|
|
if (( first_run_failed == 0 )); then
|
|
omarchy-done mark "$FIRST_RUN_DONE"
|
|
else
|
|
log_first_run "One or more first-run steps failed; first-run will retry next login"
|
|
fi
|