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.
91 lines
2.5 KiB
Bash
Executable File
91 lines
2.5 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
# omarchy:summary=Set the system monospace font
|
|
# omarchy:args=<font-name>
|
|
# omarchy:examples=omarchy font list | omarchy font set "CaskaydiaMono Nerd Font"
|
|
|
|
usage() {
|
|
echo "Usage: omarchy-font-set <font-name>"
|
|
}
|
|
|
|
font_name="${1:-}"
|
|
omarchy_root="${OMARCHY_PATH:-/usr/share/omarchy}"
|
|
|
|
case "$font_name" in
|
|
-h|--help)
|
|
usage
|
|
exit 0
|
|
;;
|
|
"")
|
|
usage >&2
|
|
exit 1
|
|
;;
|
|
esac
|
|
|
|
if ! fc-list | grep -Fqi -- "$font_name"; then
|
|
echo "Font '$font_name' not found."
|
|
exit 1
|
|
fi
|
|
|
|
if [[ -f ~/.config/alacritty/alacritty.toml ]]; then
|
|
sed -i "s/family = \".*\"/family = \"$font_name\"/g" ~/.config/alacritty/alacritty.toml
|
|
fi
|
|
|
|
if [[ -f ~/.config/kitty/kitty.conf ]]; then
|
|
sed -i "s/^font_family .*/font_family $font_name/g" ~/.config/kitty/kitty.conf
|
|
pkill -USR1 kitty
|
|
fi
|
|
|
|
if [[ -f ~/.config/ghostty/config ]]; then
|
|
sed -i "s/font-family = \".*\"/font-family = \"$font_name\"/g" ~/.config/ghostty/config
|
|
pkill -SIGUSR2 ghostty
|
|
fi
|
|
|
|
if [[ -f ~/.config/foot/foot.ini ]]; then
|
|
sed -i "s/^font=.*/font=$font_name:size=9/g" ~/.config/foot/foot.ini
|
|
fi
|
|
|
|
# fontconfig is the canonical source of truth — the omarchy shell, Qt apps,
|
|
# and anything resolving "monospace" all read from here. The shipped default
|
|
# is package-owned; create a user override only when the user changes fonts.
|
|
fontconfig_file="$HOME/.config/fontconfig/fonts.conf"
|
|
if [[ ! -f $fontconfig_file ]]; then
|
|
fontconfig_default="$omarchy_root/default/fontconfig/conf.avail/30-omarchy.conf"
|
|
if [[ ! -f $fontconfig_default ]]; then
|
|
echo "Default fontconfig file not found: $fontconfig_default" >&2
|
|
exit 1
|
|
fi
|
|
mkdir -p "$(dirname "$fontconfig_file")"
|
|
cp "$fontconfig_default" "$fontconfig_file"
|
|
fi
|
|
|
|
# We own the markup in 30-omarchy.conf, so the monospace block is predictable:
|
|
# the <string>FAMILY</string> immediately after <string>monospace</string> is
|
|
# the family we're replacing.
|
|
tmp=$(mktemp)
|
|
if ! awk -v new_font="$font_name" '
|
|
in_mono && /<string>[^<]*<\/string>/ {
|
|
sub(/<string>[^<]*<\/string>/, "<string>" new_font "</string>")
|
|
in_mono = 0
|
|
}
|
|
/<string>monospace<\/string>/ { in_mono = 1 }
|
|
{ print }
|
|
' "$fontconfig_file" >"$tmp"; then
|
|
rm -f "$tmp"
|
|
echo "Failed to update $fontconfig_file" >&2
|
|
exit 1
|
|
fi
|
|
mv "$tmp" "$fontconfig_file"
|
|
|
|
omarchy-restart-shell
|
|
|
|
if pgrep -x ghostty; then
|
|
omarchy-notification-send -g "You must restart Ghostty to see font change"
|
|
fi
|
|
|
|
if pgrep -x foot; then
|
|
omarchy-notification-send -g "You must restart Foot to see font change"
|
|
fi
|
|
|
|
omarchy-hook font-set "$font_name"
|