From fc6feedae5ab171a2b90a28f7c4ccedf6913afde Mon Sep 17 00:00:00 2001 From: Ryan Hughes Date: Sat, 6 Jun 2026 19:29:24 -0400 Subject: [PATCH] Load Omarchy fontconfig after generic aliases --- bin/omarchy-font-set | 4 ++-- bin/omarchy-upgrade-to-4 | 2 +- .../conf.avail/{30-omarchy.conf => 50-omarchy.conf} | 0 docs/file-layout.md | 4 ++-- test/shell.d/config-test.sh | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) rename default/fontconfig/conf.avail/{30-omarchy.conf => 50-omarchy.conf} (100%) diff --git a/bin/omarchy-font-set b/bin/omarchy-font-set index c0768f89..59c22ca5 100755 --- a/bin/omarchy-font-set +++ b/bin/omarchy-font-set @@ -50,7 +50,7 @@ fi # 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" + fontconfig_default="$omarchy_root/default/fontconfig/conf.avail/50-omarchy.conf" if [[ ! -f $fontconfig_default ]]; then echo "Default fontconfig file not found: $fontconfig_default" >&2 exit 1 @@ -59,7 +59,7 @@ if [[ ! -f $fontconfig_file ]]; then cp "$fontconfig_default" "$fontconfig_file" fi -# We own the markup in 30-omarchy.conf, so the monospace block is predictable: +# We own the markup in 50-omarchy.conf, so the monospace block is predictable: # the FAMILY immediately after monospace is # the family we're replacing. tmp=$(mktemp) diff --git a/bin/omarchy-upgrade-to-4 b/bin/omarchy-upgrade-to-4 index 260e52f7..4a843d69 100755 --- a/bin/omarchy-upgrade-to-4 +++ b/bin/omarchy-upgrade-to-4 @@ -1381,7 +1381,7 @@ refresh xournalpp/settings.xml 1c1a9efbf1b6dc7813bf3440fd5bf8409fc283e8d0192ca29 # Legacy ~/.config path -> package-owned destination (where the file now lives): # environment.d/fcitx.conf -> /usr/lib/environment.d/10-omarchy-fcitx.conf # fastfetch/config.jsonc -> /etc/fastfetch/config.jsonc -# fontconfig/fonts.conf -> /usr/share/fontconfig/conf.avail/30-omarchy.conf +# fontconfig/fonts.conf -> /usr/share/fontconfig/conf.avail/50-omarchy.conf # mimeapps.list -> /usr/share/applications/mimeapps.list # omarchy.ttf -> /usr/share/fonts/omarchy/omarchy.ttf # systemd/user/bt-agent.service -> /usr/lib/systemd/user/bt-agent.service diff --git a/default/fontconfig/conf.avail/30-omarchy.conf b/default/fontconfig/conf.avail/50-omarchy.conf similarity index 100% rename from default/fontconfig/conf.avail/30-omarchy.conf rename to default/fontconfig/conf.avail/50-omarchy.conf diff --git a/docs/file-layout.md b/docs/file-layout.md index 29ab81de..fe1293e0 100644 --- a/docs/file-layout.md +++ b/docs/file-layout.md @@ -92,8 +92,8 @@ default/** ──► omarchy-settings /usr/share/omarchy ├─ nautilus-python/extensions/*.py /etc/skel/.local/share/nautilus-python/extensions/ ├─ uwsm/env.d/10-omarchy /usr/share/uwsm/env.d/ ├─ environment.d/*.conf /usr/lib/environment.d/ - ├─ fontconfig/conf.avail/30-omarchy.conf /usr/share/fontconfig/conf.avail/ - │ + symlink /etc/fonts/conf.d/30-omarchy.conf + ├─ fontconfig/conf.avail/50-omarchy.conf /usr/share/fontconfig/conf.avail/ + │ + symlink /etc/fonts/conf.d/50-omarchy.conf ├─ xdg-terminal-exec/*.list /usr/share/xdg-terminal-exec/ ├─ applications/mimeapps.list /usr/share/applications/mimeapps.list ├─ systemd/user/*.{service,path} /usr/lib/systemd/user/ diff --git a/test/shell.d/config-test.sh b/test/shell.d/config-test.sh index ad1a37d7..30431d53 100755 --- a/test/shell.d/config-test.sh +++ b/test/shell.d/config-test.sh @@ -107,7 +107,7 @@ package_defaults = [ ("default/uwsm/env.d/10-omarchy", "/usr/share/uwsm/env.d/10-omarchy", "uwsm/env"), ("default/uwsm/default", None, "uwsm/default"), ("default/environment.d/10-omarchy-fcitx.conf", "/usr/lib/environment.d/10-omarchy-fcitx.conf", "environment.d/fcitx.conf"), - ("default/fontconfig/conf.avail/30-omarchy.conf", "/usr/share/fontconfig/conf.avail/30-omarchy.conf", "fontconfig/fonts.conf"), + ("default/fontconfig/conf.avail/50-omarchy.conf", "/usr/share/fontconfig/conf.avail/50-omarchy.conf", "fontconfig/fonts.conf"), ("default/xdg-terminal-exec/hyprland-xdg-terminals.list", "/usr/share/xdg-terminal-exec/hyprland-xdg-terminals.list", "xdg-terminals.list"), ("default/applications/mimeapps.list", "/usr/share/applications/mimeapps.list", "mimeapps.list"), ("etc/fastfetch/config.jsonc", "/etc/fastfetch/config.jsonc", "fastfetch/config.jsonc"),