diff --git a/settings/quickshell.nix b/settings/quickshell.nix index 330c3be..bcd613b 100644 --- a/settings/quickshell.nix +++ b/settings/quickshell.nix @@ -13,11 +13,12 @@ in qt6.qt5compat # Qt5Compat.GraphicalEffects in Bar.qml ]; - # Icon font for the shell (ligature-based: text "volume_up" renders the - # icon) — same font caelestia uses; nerd-font glyphs stay for terminals. - fonts.packages = [ pkgs.material-symbols ]; + # Shell fonts, matching caelestia: Rubik for all UI text, Material Symbols + # Rounded for icons (ligature-based: text "volume_up" renders the icon). + # Scoped to the bar only — terminals/GTK still follow stylix. + fonts.packages = [ pkgs.material-symbols pkgs.rubik ]; - home-manager.users.fred = { config, lib, pkgs, osConfig, ... }: + home-manager.users.fred = { config, lib, pkgs, ... }: let c = config.lib.stylix.colors; in { @@ -50,8 +51,6 @@ in [ -n "$pw" ] && ${pkgs.networkmanager}/bin/nmcli device wifi connect "$ssid" password "$pw" ''; nmcli = "${pkgs.networkmanager}/bin/nmcli"; - # Follow stylix's monospace choice so a font swap propagates to the bar - monoFont = osConfig.stylix.fonts.monospace.name; # Shell chrome fragment shader: the bar, screen frame, dropdown panel # and toast are one signed-distance field merged with a circular # smooth-min (caelestia-style liquid junctions); the 2px border is the @@ -218,7 +217,7 @@ in // colour animation stays in-hue instead of dipping through // transparent *black* (which reads as an extra flash colour). readonly property color base02t: "#00${c.base02}" - readonly property string fontFamily: "${monoFont}" + readonly property string fontFamily: "Rubik" // Ligature-based icon font: text "volume_up" renders the icon readonly property string iconFont: "Material Symbols Rounded" // Matches hyprland general.border_size (col.inactive_border = base03)