diff options
| -rw-r--r-- | AGENTS.md | 7 | ||||
| -rw-r--r-- | rofi/udt/common.rasi | 8 | ||||
| -rw-r--r-- | rofi/udt/confirm.rasi | 2 | ||||
| -rw-r--r-- | rofi/udt/grid.rasi | 2 | ||||
| -rw-r--r-- | rofi/udt/header.rasi | 2 | ||||
| -rw-r--r-- | rofi/udt/launcher.rasi | 6 | ||||
| -rw-r--r-- | rofi/udt/powermenu.rasi | 6 | ||||
| -rw-r--r-- | rofi/udt/screenshot.rasi | 4 | ||||
| -rw-r--r-- | rofi/udt/ssh.rasi | 2 | ||||
| -rw-r--r-- | templates/qt-gtk/gtk3-settings.ini | 4 | ||||
| -rw-r--r-- | templates/qt-gtk/qt5ct.conf | 6 | ||||
| -rw-r--r-- | templates/qt-gtk/qt6ct.conf | 6 |
12 files changed, 31 insertions, 24 deletions
@@ -9,6 +9,13 @@ UI text, Inconsolata Nerd Font Mono for monospace. It covers rofi, Hyprland window borders, conky, Qt5/Qt6, GTK3/GTK4, waybar, kitty, Sublime Text, hyprlock, neovim, btop, Joplin and Feishin. +Font **sizes** are not this repo's. The keystone settings window (quickshell +repo, `desktop/modules/fonts`) owns them: the Qt and GTK templates carry no +size keys, so a re-install leaves them alone, and every rofi font is +`var(kf-<file>-<selector>, "Family N")`, whose fallback is the designed size +and which `~/.config/keystone/rofi-fonts.rasi`, imported by `common.rasi`, +overrides. A new rofi font follows the same form, or the page cannot scale it. + The repo holds the canonical copies. `./install.sh` symlinks them into place, so the working config cannot drift from what is committed. Everything outside `~/.config/rofi/udt/` and `~/bin/` was edited in place; `docs/MIGRATION.md` is diff --git a/rofi/udt/common.rasi b/rofi/udt/common.rasi index 0b9526b..140596e 100644 --- a/rofi/udt/common.rasi +++ b/rofi/udt/common.rasi @@ -6,10 +6,14 @@ @import "palette.rasi" @import "accent.rasi" +// Font sizes from the keystone settings window (Appearance > Fonts): each +// font below is var(kf-..., "designed"), and this file, when present, sets +// them. Absent, the designed sizes apply. +@import "~/.config/keystone/rofi-fonts.rasi" * { - font: "Noto Sans 11"; - monospace-font: "Inconsolata Nerd Font Mono 11"; + font: var(kf-common-font, "Noto Sans 11"); + monospace-font: var(kf-common-mono, "Inconsolata Nerd Font Mono 11"); background-color: transparent; text-color: @text; diff --git a/rofi/udt/confirm.rasi b/rofi/udt/confirm.rasi index 242c86a..3308927 100644 --- a/rofi/udt/confirm.rasi +++ b/rofi/udt/confirm.rasi @@ -21,7 +21,7 @@ message { } textbox { - font: "Noto Sans Bold 18"; + font: var(kf-confirm-textbox, "Noto Sans Bold 18"); text-color: @text; horizontal-align: 0.5; } diff --git a/rofi/udt/grid.rasi b/rofi/udt/grid.rasi index 931aae7..b385181 100644 --- a/rofi/udt/grid.rasi +++ b/rofi/udt/grid.rasi @@ -49,7 +49,7 @@ element { /* Left-aligned, not centred: each row is a glyph followed by its name, so it * reads as a label rather than a lone symbol. */ element-text { - font: "Noto Color Emoji 16"; + font: var(kf-grid-element, "Noto Color Emoji 16"); horizontal-align: 0.0; vertical-align: 0.5; } diff --git a/rofi/udt/header.rasi b/rofi/udt/header.rasi index 921e104..b395b32 100644 --- a/rofi/udt/header.rasi +++ b/rofi/udt/header.rasi @@ -34,7 +34,7 @@ dummy { /* Both sit on plates so they stay legible over any wallpaper. */ prompt { - font: "Noto Sans Bold 15"; + font: var(kf-header-prompt, "Noto Sans Bold 15"); text-color: @text; background-color: @base; border-radius: 6px; diff --git a/rofi/udt/launcher.rasi b/rofi/udt/launcher.rasi index 6bd2bc8..710c47b 100644 --- a/rofi/udt/launcher.rasi +++ b/rofi/udt/launcher.rasi @@ -45,7 +45,7 @@ inputbar { } entry { - font: "Noto Sans 15"; + font: var(kf-launcher-entry, "Noto Sans 15"); placeholder: "Search"; } @@ -60,7 +60,7 @@ button { border-radius: 10px; background-color: @surface0; text-color: @subtext0; - font: "Noto Sans Bold 11"; + font: var(kf-launcher-button, "Noto Sans Bold 11"); horizontal-align: 0.5; cursor: pointer; } @@ -93,6 +93,6 @@ element-icon { } element-text { - font: "Noto Sans 11"; + font: var(kf-launcher-element, "Noto Sans 11"); horizontal-align: 0.5; } diff --git a/rofi/udt/powermenu.rasi b/rofi/udt/powermenu.rasi index ff7ba53..c057a4f 100644 --- a/rofi/udt/powermenu.rasi +++ b/rofi/udt/powermenu.rasi @@ -73,7 +73,7 @@ inputbar { * spacers either side centre it. */ prompt { expand: false; - font: "Noto Sans Bold 28"; + font: var(kf-powermenu-prompt, "Noto Sans Bold 28"); text-color: @text; horizontal-align: 0.5; } @@ -107,7 +107,7 @@ element { * (U+F0904), and heading the stack with it breaks the row rather than fixing * it. Verified by screenshot, both ways. */ element-text { - font: "Inconsolata Nerd Font Mono 42"; + font: var(kf-powermenu-element, "Inconsolata Nerd Font Mono 42"); horizontal-align: 0.5; vertical-align: 0.5; text-color: inherit; @@ -121,7 +121,7 @@ message { } textbox { - font: "Noto Sans 12"; + font: var(kf-powermenu-textbox, "Noto Sans 12"); text-color: @subtext0; horizontal-align: 0.5; } diff --git a/rofi/udt/screenshot.rasi b/rofi/udt/screenshot.rasi index f3f8c4f..76a7900 100644 --- a/rofi/udt/screenshot.rasi +++ b/rofi/udt/screenshot.rasi @@ -50,7 +50,7 @@ card { /* The header, as in ssh.rasi: the prompt lifted out of the inputbar. */ prompt { - font: "Noto Sans Bold 15"; + font: var(kf-screenshot-prompt, "Noto Sans Bold 15"); text-color: @text; padding: 0 4px; } @@ -80,7 +80,7 @@ element { } element-text { - font: "Inconsolata Nerd Font Mono 72"; + font: var(kf-screenshot-element, "Inconsolata Nerd Font Mono 72"); horizontal-align: 0.5; vertical-align: 0.5; text-color: inherit; diff --git a/rofi/udt/ssh.rasi b/rofi/udt/ssh.rasi index 52899f1..2049104 100644 --- a/rofi/udt/ssh.rasi +++ b/rofi/udt/ssh.rasi @@ -45,7 +45,7 @@ element { } element-text { - font: "Noto Sans 13"; + font: var(kf-ssh-element, "Noto Sans 13"); horizontal-align: 0.5; vertical-align: 0.5; } diff --git a/templates/qt-gtk/gtk3-settings.ini b/templates/qt-gtk/gtk3-settings.ini index f0fe1d8..8c961a5 100644 --- a/templates/qt-gtk/gtk3-settings.ini +++ b/templates/qt-gtk/gtk3-settings.ini @@ -1,7 +1,7 @@ # Merged into ~/.config/gtk-3.0/settings.ini by install.sh, key by key: every # key here is set, every other key in the live file is left alone. Icons, -# cursor, modules and sounds are the appearance drawer's to set. +# cursor, modules and sounds are the appearance drawer's to set, and the +# font the keystone fonts page's. [Settings] gtk-application-prefer-dark-theme=true -gtk-font-name=Noto Sans, 10 gtk-theme-name=udt diff --git a/templates/qt-gtk/qt5ct.conf b/templates/qt-gtk/qt5ct.conf index cb94ab7..5db6334 100644 --- a/templates/qt-gtk/qt5ct.conf +++ b/templates/qt-gtk/qt5ct.conf @@ -1,10 +1,8 @@ # Merged into ~/.config/qt5ct/qt5ct.conf by install.sh, key by key: every key # here is set, every other key in the live file is left alone. icon_theme is -# the appearance drawer's to set, so it is not here. +# the appearance drawer's to set, and the [Fonts] sizes the keystone fonts +# page's, so neither is here. [Appearance] custom_palette=false standard_dialogs=xdgdesktopportal style=kvantum-dark -[Fonts] -fixed="Inconsolata Nerd Font Mono,14,-1,5,50,0,0,0,0,0" -general="Noto Sans,14,-1,5,50,0,0,0,0,0,Regular" diff --git a/templates/qt-gtk/qt6ct.conf b/templates/qt-gtk/qt6ct.conf index 4de7efa..d62f0e6 100644 --- a/templates/qt-gtk/qt6ct.conf +++ b/templates/qt-gtk/qt6ct.conf @@ -1,10 +1,8 @@ # Merged into ~/.config/qt6ct/qt6ct.conf by install.sh, key by key: every key # here is set, every other key in the live file is left alone. icon_theme is -# the appearance drawer's to set, so it is not here. +# the appearance drawer's to set, and the [Fonts] sizes the keystone fonts +# page's, so neither is here. [Appearance] custom_palette=false standard_dialogs=xdgdesktopportal style=kvantum-dark -[Fonts] -fixed="Inconsolata Nerd Font Mono,14,-1,5,400,0,0,0,0,0,0,0,0,0,0,1,,0,0" -general="Noto Sans,14,-1,5,400,0,0,0,0,0,0,0,0,0,0,1,Regular,0,0" |