Ryan Hughes
babfafa5e9
Reorganizes Omarchy 4 around three layers for populating $HOME:
Seed: omarchy-settings ships defaults to /etc/skel; useradd -m
copies them on user creation
Finalize: omarchy-finalize-user (renamed from omarchy-setup-user)
handles only the runtime tweaks /etc/skel can't do — skill
symlinks, xdg-user-dirs, default browser/mailto, vconsole→hypr
keyboard sync, and install/user/all.sh
Resync: omarchy-reinstall-configs is the explicit, destructive
resync of /etc/skel into an existing user's $HOME
Package-owned files move out of config/ into default/, where the
omarchy-settings PKGBUILD installs them to real system paths:
config/environment.d/fcitx.conf -> /usr/lib/environment.d/
config/fontconfig/fonts.conf -> /usr/share/fontconfig/conf.avail/
config/mimeapps.list -> /usr/share/applications/
config/omarchy.ttf -> /usr/share/fonts/omarchy/
config/systemd/user/*.service -> /usr/lib/systemd/user/
config/uwsm/default -> /usr/share/omarchy/default/uwsm/
config/uwsm/env -> /usr/share/uwsm/env.d/10-omarchy
config/xdg-terminals.list -> /usr/share/xdg-terminal-exec/
omarchy-upgrade-to-4 grows a 'retire' action (renamed from 'move' to
clarify nothing is copied — the system path is owned by the new package
once the user's hash-matched ~/.config copy is removed). Mismatched
copies are kept as backups so user overrides survive the upgrade.
Other simplifications:
- Single env bootstrap at default/bash/env-bootstrap sourced by
/etc/profile.d/omarchy.sh, /etc/skel/.bashrc,
/usr/share/uwsm/env.d/10-omarchy, and default/bash/envs. PATH
prepend only in dev-link mode (production uses /usr/bin/omarchy-*).
- omarchy-refresh-config reads from /etc/skel/.config so refresh
means 'snap to skel'.
- omarchy-reinstall-configs collapses to 'cp -af /etc/skel/. ~/'
plus limine/plymouth/nvim refresh.
- omarchy-font-set uses awk against our own 30-omarchy.conf instead
of xmlstarlet; xmlstarlet dropped from omarchy-base.packages.
- Defer user systemd enables (bt-agent, sleep-lock,
recover-internal-monitor) to first-run via
install/user/first-run/enable-user-units.sh; delete
omarchy-user-systemctl-enable and the per-hardware install
scripts that called it.
- Wireplumber bluetooth-a2dp-autoconnect.conf moves to config/ so
/etc/skel ships it; install/user/hardware/bluetooth.sh deleted.
- Default terminal switched to foot.desktop.
- docs/file-layout.md documents the three-layer model and the
build-time repo→path map.
125 lines
3.2 KiB
Bash
Executable File
125 lines
3.2 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
|
|
|
|
omarchy-finalize-user "${finalize_user_args[@]}" || true
|
|
|
|
state_dir=~/.local/state/omarchy
|
|
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"
|
|
}
|
|
|
|
notification_server_ready() {
|
|
if command -v gdbus >/dev/null 2>&1; then
|
|
gdbus call --session \
|
|
--dest org.freedesktop.Notifications \
|
|
--object-path /org/freedesktop/Notifications \
|
|
--method org.freedesktop.Notifications.GetServerInformation >/dev/null 2>&1
|
|
elif command -v busctl >/dev/null 2>&1; then
|
|
busctl --user call \
|
|
org.freedesktop.Notifications \
|
|
/org/freedesktop/Notifications \
|
|
org.freedesktop.Notifications \
|
|
GetServerInformation >/dev/null 2>&1
|
|
else
|
|
return 0
|
|
fi
|
|
}
|
|
|
|
wait_for_notifications() {
|
|
command -v omarchy-shell >/dev/null || return 0
|
|
|
|
for _ in {1..100}; do
|
|
if omarchy-shell notifications ping >/dev/null 2>&1 && notification_server_ready; then
|
|
return 0
|
|
fi
|
|
sleep 0.1
|
|
done
|
|
|
|
log_first_run "Timed out waiting for notification service; continuing"
|
|
return 0
|
|
}
|
|
|
|
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
|
|
}
|
|
|
|
USER_MARKER="$state_dir/first-run-user.done"
|
|
if [[ ! -f $USER_MARKER || $force -eq 1 ]]; then
|
|
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 "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"
|
|
|
|
wait_for_notifications
|
|
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
|
|
touch "$USER_MARKER"
|
|
else
|
|
log_first_run "One or more first-run steps failed; first-run will retry next login"
|
|
fi
|
|
else
|
|
echo "First-run already complete (rerun with --force to refresh)."
|
|
fi
|