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.
38 lines
1.2 KiB
Bash
Executable File
38 lines
1.2 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
# omarchy:summary=Set the default terminal used by xdg-terminal-exec
|
|
# omarchy:args=[alacritty|foot|ghostty|kitty]
|
|
# omarchy:examples=omarchy default terminal ghostty | omarchy default terminal kitty
|
|
|
|
if (($# == 0)); then
|
|
desktop_id=$(xdg-terminal-exec --print-id 2>/dev/null || true)
|
|
desktop_id=${desktop_id%%:*}
|
|
case "$desktop_id" in
|
|
Alacritty.desktop) echo "alacritty" ;;
|
|
foot.desktop) echo "foot" ;;
|
|
com.mitchellh.ghostty.desktop) echo "ghostty" ;;
|
|
kitty.desktop) echo "kitty" ;;
|
|
*) echo "$desktop_id" ;;
|
|
esac
|
|
exit 0
|
|
fi
|
|
|
|
case "$1" in
|
|
alacritty) desktop_id="Alacritty.desktop"; name="Alacritty"; glyph= ;;
|
|
foot) desktop_id="foot.desktop"; name="Foot"; glyph= ;;
|
|
ghostty) desktop_id="com.mitchellh.ghostty.desktop"; name="Ghostty"; glyph= ;;
|
|
kitty) desktop_id="kitty.desktop"; name="Kitty"; glyph= ;;
|
|
*)
|
|
echo "Usage: omarchy-default-terminal <alacritty|foot|ghostty|kitty>"
|
|
exit 1
|
|
;;
|
|
esac
|
|
|
|
cat >~/.config/xdg-terminals.list <<EOF
|
|
# Terminal emulator preference order for xdg-terminal-exec
|
|
# The first found and valid terminal will be used
|
|
$desktop_id
|
|
EOF
|
|
|
|
omarchy-notification-send -g $glyph "$name is now the default terminal"
|