mirror of
https://github.com/arthur-pbty/arthur-os.git
synced 2026-08-01 20:28:16 +02:00
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.
44 lines
1.2 KiB
Bash
Executable File
44 lines
1.2 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
# omarchy:summary=Copy a shipped user config from /etc/skel/.config into ~/.config (backs up your version).
|
|
# omarchy:args=<config-path>
|
|
|
|
config_file=${1:-}
|
|
|
|
if [[ -z $config_file ]]; then
|
|
cat <<USAGE
|
|
Usage: $0 [config_file]
|
|
|
|
Must provide a file path relative to .config to be refreshed.
|
|
To copy /etc/skel/.config/hypr/hyprland.lua to ~/.config/hypr/hyprland.lua:
|
|
|
|
$0 hypr/hyprland.lua
|
|
USAGE
|
|
exit 1
|
|
fi
|
|
|
|
user_config_file="${HOME}/.config/$config_file"
|
|
default_config_file="/etc/skel/.config/$config_file"
|
|
backup_config_file="$user_config_file.bak.$(date +%s)"
|
|
|
|
if [[ ! -e $default_config_file ]]; then
|
|
echo "Not a shipped user config: $config_file" >&2
|
|
exit 1
|
|
fi
|
|
|
|
mkdir -p "$(dirname "$user_config_file")"
|
|
|
|
if [[ -f $user_config_file ]]; then
|
|
cp -f "$user_config_file" "$backup_config_file"
|
|
cp -f "$default_config_file" "$user_config_file"
|
|
|
|
if cmp -s "$user_config_file" "$backup_config_file"; then
|
|
rm "$backup_config_file"
|
|
else
|
|
echo -e "\e[31mReplaced $user_config_file with new Omarchy default.\nSaved backup as ${backup_config_file}.\n\n\e[32mChanges:\e[0m"
|
|
diff "$user_config_file" "$backup_config_file" || true
|
|
fi
|
|
else
|
|
cp -f "$default_config_file" "$user_config_file"
|
|
fi
|