diff --git a/modules/home/waybar.nix b/modules/home/waybar.nix index c19e7dd..aa47677 100644 --- a/modules/home/waybar.nix +++ b/modules/home/waybar.nix @@ -158,12 +158,12 @@ let # Active keyboard layout (per focused device) — only placed in # modules-right when showLanguage (see above). "hyprland/language" = { - format = "󰌌 {short}"; + format = "󰌌 {short}"; tooltip = false; }; pulseaudio = { - format = "{icon} {volume}%"; + format = "{icon} {volume}%"; format-muted = "󰝟"; format-icons.default = [ "󰕿" "󰖀" "󰕾" ]; on-click = "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"; @@ -187,8 +187,8 @@ let battery = { states = { warning = 25; critical = 10; }; - format = "{icon} {capacity}%"; - format-charging = "󰂄 {capacity}%"; + format = "{icon} {capacity}%"; + format-charging = "󰂄 {capacity}%"; format-icons = [ "󰁺" "󰁼" "󰁾" "󰂀" "󰁹" ]; }; @@ -361,9 +361,15 @@ let always the alert color. */ #custom-doctor { color: @bad; } - /* The power-profile speedometer glyph renders small in its em box — - size it up so it reads at a glance like the other indicators. */ - #custom-powerprofile { font-size: ${toString (t.fonts.size + 3)}pt; } + /* Icon-only status modules carry no text, so they don't get the + (size+2)pt Pango icon span the icon+text modules use — bump their + font-size to match, or these glyphs read smaller than the volume / + battery / language icons beside them. */ + #custom-recording, #custom-updates, #custom-vpn, #custom-nightlight, #custom-doctor, #custom-notification { font-size: ${toString (t.fonts.size + 2)}pt; } + + /* The speedometer + caffeine glyphs render small in their em box — + size them up a touch more so they read at a glance. */ + #custom-powerprofile, #idle_inhibitor { font-size: ${toString (t.fonts.size + 3)}pt; } /* notifications waiting → accent; Do-Not-Disturb → muted bell-off */ #custom-notification.notification { color: @accent; } diff --git a/themes/boreal/waybar.css b/themes/boreal/waybar.css index 3bfbe1a..dccf0aa 100644 --- a/themes/boreal/waybar.css +++ b/themes/boreal/waybar.css @@ -74,10 +74,13 @@ window#waybar { margin: 0; } -/* ── Launcher — the aurora-violet monogram opens the pill ─────────────*/ +/* ── Launcher — the aurora-violet Nomarchy mark opens the pill ──────── + The mark lives at U+F000 in the dedicated "Nomarchy" font; pin the + family or the Nerd Font's glass glyph at the same codepoint wins. */ #custom-nomarchy { color: @accent; - font-size: 16px; + font-family: Nomarchy; + font-size: 18px; padding: 0 12px 0 14px; } #custom-nomarchy:hover { color: @accentAlt; } @@ -126,8 +129,19 @@ window#waybar { #battery.warning:not(.charging) { color: @warn; } #battery.critical:not(.charging) { color: @bad; } -/* Power-profile speedometer renders small in its em box — size it up. */ -#custom-powerprofile { font-size: 16px; } +/* Icon-only status modules carry no text, so they don't get the 13pt + Pango icon span the icon+text modules (volume/battery/language) use — + bump their font-size to match, or these glyphs read noticeably smaller + than their neighbours. */ +#custom-recording, +#custom-updates, +#custom-doctor, +#custom-nightlight, +#custom-vpn, +#custom-notification { font-size: 17px; } +/* Speedometer + caffeine cup render small in their em box — a touch more. */ +#custom-powerprofile, +#idle_inhibitor { font-size: 18px; } #custom-notification.notification { color: @accent; } #custom-notification.dnd-none, diff --git a/themes/boreal/waybar.jsonc b/themes/boreal/waybar.jsonc index c417747..d29b996 100644 --- a/themes/boreal/waybar.jsonc +++ b/themes/boreal/waybar.jsonc @@ -87,7 +87,7 @@ "on-click": "nomarchy-nightlight toggle" }, "hyprland/language": { - "format": "󰌌 {short}", + "format": "󰌌 {short}", "tooltip": false }, "custom/vpn": { @@ -98,10 +98,10 @@ }, "pulseaudio": { "scroll-step": 5, - "format": "{icon} {volume}%", - "format-bluetooth": "{icon} {volume}%", + "format": "{icon} {volume}%", + "format-bluetooth": "{icon} {volume}%", "format-bluetooth-muted": " {icon}", - "format-muted": " muted", + "format-muted": " muted", "format-icons": { "headphone": "", "hands-free": "", @@ -124,9 +124,9 @@ "warning": 25, "critical": 10 }, - "format": "{icon} {capacity}%", - "format-charging": " {capacity}%", - "format-plugged": " {capacity}%", + "format": "{icon} {capacity}%", + "format-charging": " {capacity}%", + "format-plugged": " {capacity}%", "format-icons": [ "", "", diff --git a/themes/executive-slate/waybar.css b/themes/executive-slate/waybar.css index bc77640..582e1de 100644 --- a/themes/executive-slate/waybar.css +++ b/themes/executive-slate/waybar.css @@ -72,10 +72,13 @@ window#waybar { #battery, #custom-vpn { margin-left: 6px; } -/* ── Menu launcher — the one branded accent glyph ────────────────── */ +/* ── Menu launcher — the branded Nomarchy mark ─────────────────────── + The mark lives at U+F000 in the dedicated "Nomarchy" font; pin the + family or the Nerd Font's glass glyph at the same codepoint wins. */ #custom-nomarchy { color: @accent; - font-size: 15px; + font-family: Nomarchy; + font-size: 16px; padding: 0 14px; } #custom-nomarchy:hover { @@ -126,8 +129,19 @@ window#waybar { #custom-updates.available { color: @accent; } -/* Power-profile glyph renders small in its em box — size it up. */ -#custom-powerprofile { font-size: 16px; } +/* Icon-only status modules carry no text, so they don't get the 13pt + Pango icon span the icon+text modules (volume/battery/language) use — + bump their font-size to match, or these glyphs read smaller than their + neighbours. */ +#custom-recording, +#custom-nightlight, +#custom-updates, +#custom-vpn, +#custom-doctor, +#custom-notification { font-size: 17px; } +/* Speedometer + caffeine cup render small in their em box — a touch more. */ +#custom-powerprofile, +#idle_inhibitor { font-size: 18px; } #pulseaudio.muted { color: @muted; } diff --git a/themes/executive-slate/waybar.jsonc b/themes/executive-slate/waybar.jsonc index 22d37eb..33a6614 100644 --- a/themes/executive-slate/waybar.jsonc +++ b/themes/executive-slate/waybar.jsonc @@ -74,7 +74,7 @@ "on-click": "nomarchy-nightlight toggle" }, "hyprland/language": { - "format": "󰌌 {short}", + "format": "󰌌 {short}", "tooltip": false }, "custom/updates": { @@ -86,10 +86,10 @@ }, "pulseaudio": { "scroll-step": 5, - "format": "{icon} {volume}%", - "format-bluetooth": "{icon} {volume}%", + "format": "{icon} {volume}%", + "format-bluetooth": "{icon} {volume}%", "format-bluetooth-muted": " {icon}", - "format-muted": " muted", + "format-muted": " muted", "format-icons": { "headphone": "", "hands-free": "", @@ -118,9 +118,9 @@ "warning": 25, "critical": 10 }, - "format": "{icon} {capacity}%", - "format-charging": " {capacity}%", - "format-plugged": " {capacity}%", + "format": "{icon} {capacity}%", + "format-charging": " {capacity}%", + "format-plugged": " {capacity}%", "format-icons": [ "", "", diff --git a/themes/summer-day/waybar.jsonc b/themes/summer-day/waybar.jsonc index 8e8188a..52bacb5 100644 --- a/themes/summer-day/waybar.jsonc +++ b/themes/summer-day/waybar.jsonc @@ -37,10 +37,10 @@ }, "pulseaudio": { - "format": "{icon} {volume}%", - "format-bluetooth": "{icon}  {volume}%", + "format": "{icon} {volume}%", + "format-bluetooth": "{icon}  {volume}%", "format-bluetooth-muted": "  muted", - "format-muted": " muted", + "format-muted": " muted", "format-icons": { "headphone": "", "hands-free": "", @@ -58,9 +58,9 @@ "interval": 60, "states": { "warning": 30, "critical": 15 }, "max-length": 10, - "format": "{icon} {capacity}%", - "format-charging": " {capacity}%", - "format-plugged": " {capacity}%", + "format": "{icon} {capacity}%", + "format-charging": " {capacity}%", + "format-plugged": " {capacity}%", "format-full": " 100%", "format-icons": ["", "", "", "", ""], "on-click": "nomarchy-menu power", @@ -110,7 +110,7 @@ }, "hyprland/language": { - "format": "󰌌 {short}", + "format": "󰌌 {short}", "tooltip": false }, diff --git a/themes/summer-night/waybar.jsonc b/themes/summer-night/waybar.jsonc index 344f25f..360af3c 100644 --- a/themes/summer-night/waybar.jsonc +++ b/themes/summer-night/waybar.jsonc @@ -38,10 +38,10 @@ "pulseaudio": { "scroll-step": 5, - "format": "{icon} {volume}%", - "format-bluetooth": "{icon} {volume}%", + "format": "{icon} {volume}%", + "format-bluetooth": "{icon} {volume}%", "format-bluetooth-muted": " {icon}", - "format-muted": " muted", + "format-muted": " muted", "format-icons": { "headphone": "", "hands-free": "", @@ -58,9 +58,9 @@ "battery": { "interval": 30, "states": { "warning": 25, "critical": 10 }, - "format": "{icon} {capacity}%", - "format-charging": " {capacity}%", - "format-plugged": " {capacity}%", + "format": "{icon} {capacity}%", + "format-charging": " {capacity}%", + "format-plugged": " {capacity}%", "format-icons": ["", "", "", "", ""], "on-click": "nomarchy-menu power", "tooltip-format": "Battery status" @@ -109,7 +109,7 @@ }, "hyprland/language": { - "format": "󰌌 {short}", + "format": "󰌌 {short}", "tooltip": false },