ZacharyZhang-NY/omarchycn
4
5
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases 5 Wiki Activity

Load Omarchy fontconfig after generic aliases

Browse Source
This commit is contained in:
Ryan Hughes
2026-06-06 19:31:51 -04:00
parent d2c1544d78
commit fc6feedae5
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/omarchy-font-set
+2 -2
View File
@@ -50,7 +50,7 @@ fi
# is package-owned; create a user override only when the user changes fonts. # is package-owned; create a user override only when the user changes fonts.
fontconfig_file="$HOME/.config/fontconfig/fonts.conf" fontconfig_file="$HOME/.config/fontconfig/fonts.conf"
if [[ ! -f $fontconfig_file ]]; then 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 if [[ ! -f $fontconfig_default ]]; then
echo "Default fontconfig file not found: $fontconfig_default" >&2 echo "Default fontconfig file not found: $fontconfig_default" >&2
exit 1 exit 1
@@ -59,7 +59,7 @@ if [[ ! -f $fontconfig_file ]]; then
cp "$fontconfig_default" "$fontconfig_file" cp "$fontconfig_default" "$fontconfig_file"
fi 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 <string>FAMILY</string> immediately after <string>monospace</string> is # the <string>FAMILY</string> immediately after <string>monospace</string> is
# the family we're replacing. # the family we're replacing.
tmp=$(mktemp) tmp=$(mktemp)
bin/omarchy-upgrade-to-4
+1 -1
View File
@@ -1381,7 +1381,7 @@ refresh xournalpp/settings.xml 1c1a9efbf1b6dc7813bf3440fd5bf8409fc283e8d0192ca29
# Legacy ~/.config path -> package-owned destination (where the file now lives): # Legacy ~/.config path -> package-owned destination (where the file now lives):
# environment.d/fcitx.conf -> /usr/lib/environment.d/10-omarchy-fcitx.conf # environment.d/fcitx.conf -> /usr/lib/environment.d/10-omarchy-fcitx.conf
# fastfetch/config.jsonc -> /etc/fastfetch/config.jsonc # 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 # mimeapps.list -> /usr/share/applications/mimeapps.list
# omarchy.ttf -> /usr/share/fonts/omarchy/omarchy.ttf # omarchy.ttf -> /usr/share/fonts/omarchy/omarchy.ttf
# systemd/user/bt-agent.service -> /usr/lib/systemd/user/bt-agent.service # systemd/user/bt-agent.service -> /usr/lib/systemd/user/bt-agent.service
default/fontconfig/conf.avail/30-omarchy.conf → default/fontconfig/conf.avail/50-omarchy.conf
View File
docs/file-layout.md
+2 -2
View File
@@ -92,8 +92,8 @@ default/** ──► omarchy-settings /usr/share/omarchy
├─ nautilus-python/extensions/*.py /etc/skel/.local/share/nautilus-python/extensions/ ├─ nautilus-python/extensions/*.py /etc/skel/.local/share/nautilus-python/extensions/
├─ uwsm/env.d/10-omarchy /usr/share/uwsm/env.d/ ├─ uwsm/env.d/10-omarchy /usr/share/uwsm/env.d/
├─ environment.d/*.conf /usr/lib/environment.d/ ├─ environment.d/*.conf /usr/lib/environment.d/
├─ fontconfig/conf.avail/30-omarchy.conf /usr/share/fontconfig/conf.avail/ ├─ fontconfig/conf.avail/50-omarchy.conf /usr/share/fontconfig/conf.avail/
│ + symlink /etc/fonts/conf.d/30-omarchy.conf │ + symlink /etc/fonts/conf.d/50-omarchy.conf
├─ xdg-terminal-exec/*.list /usr/share/xdg-terminal-exec/ ├─ xdg-terminal-exec/*.list /usr/share/xdg-terminal-exec/
├─ applications/mimeapps.list /usr/share/applications/mimeapps.list ├─ applications/mimeapps.list /usr/share/applications/mimeapps.list
├─ systemd/user/*.{service,path} /usr/lib/systemd/user/ ├─ systemd/user/*.{service,path} /usr/lib/systemd/user/
test/shell.d/config-test.sh
+1 -1
View File
@@ -107,7 +107,7 @@ package_defaults = [
("default/uwsm/env.d/10-omarchy", "/usr/share/uwsm/env.d/10-omarchy", "uwsm/env"), ("default/uwsm/env.d/10-omarchy", "/usr/share/uwsm/env.d/10-omarchy", "uwsm/env"),
("default/uwsm/default", None, "uwsm/default"), ("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/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/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"), ("default/applications/mimeapps.list", "/usr/share/applications/mimeapps.list", "mimeapps.list"),
("etc/fastfetch/config.jsonc", "/etc/fastfetch/config.jsonc", "fastfetch/config.jsonc"), ("etc/fastfetch/config.jsonc", "/etc/fastfetch/config.jsonc", "fastfetch/config.jsonc"),