hm/wayland-desktop: Style Niri and Waybar To look better with Rose Pine.

Changes

2 changed files (+45/-41)

• modules/hm/wayland-desktop/niri.nix
  • @@ -124,7 +124,7 @@ let
    } border { - width ${builtins.toString (gap / 5)} + width 1 active-color "${activeBorderColor}" inactive-color "${inactiveBorderColor}" }
  • @@ -168,7 +168,7 @@ let
    // Enable rounded corners for all windows. window-rule { - geometry-corner-radius 2 + geometry-corner-radius 5 clip-to-geometry true }
  • @@ -310,9 +310,9 @@ in
    text = configFile { backdropColor = dark.base; activeFocusRingColor = dark.rose; - inactiveFocusRingColor = dark.highlightHigh; - activeBorderColor = dark.highlightLow; - inactiveBorderColor = dark.highlightLow; + inactiveFocusRingColor = dark.highlightLow; + activeBorderColor = dark.highlightHigh; + inactiveBorderColor = dark.highlightHigh; cursorTheme = "BreezeX-RosePine-Linux"; }; };
  • @@ -321,9 +321,9 @@ in
    text = configFile { backdropColor = light.base; activeFocusRingColor = light.rose; - inactiveFocusRingColor = light.highlightHigh; - activeBorderColor = light.highlightLow; - inactiveBorderColor = light.highlightLow; + inactiveFocusRingColor = light.highlightLow; + activeBorderColor = light.highlightHigh; + inactiveBorderColor = light.highlightHigh; cursorTheme = "BreezeX-RosePineDawn-Linux"; }; };
• modules/hm/wayland-desktop/waybar.nix
  • @@ -31,7 +31,10 @@ let
    cfg = config.wayland-desktop.waybar; in { - imports = [ ../palette/rose-pine.nix ]; + imports = [ + ../fonts + ../palette/rose-pine.nix + ]; options.wayland-desktop.waybar.soundSystem = lib.mkOption { type = lib.types.enum [
  • @@ -92,17 +95,24 @@ in
    xdg.configFile = let baseStyle = '' - * { - font-family: Roboto, Helvetica, Arial, sans-serif; - font-size: 16px; + window#waybar { + background: transparent; } - window#waybar { - font-weight: bold; + window#waybar > .horizontal { + font-family: "Noto Sans", Roboto, Helvetica, Arial, sans-serif; + font-size: 14px; + + min-height: 36px; + margin: 15px; + margin-top: 7px; + border: 1px solid currentColor; + + border-radius: 6px; } .module { - padding: 2px 4px; + padding: 2px 10px; margin: 4px; border-radius: 3px;
  • @@ -110,45 +120,39 @@ in
    #clock, #network, - #pulseaudio, + #wireplumber, #tray { color: inherit; } - ''; - in - { - "waybar/style-light.css".text = '' - ${baseStyle} - window#waybar { - background-color: ${light.surface}; - color: ${light.text}; + #clock, #wireplumber { + font-family: "Atkinson Hyperlegible Next", "Noto Sans", sans-serif; + font-size: 16px; + font-weight: bold; } + ''; - #tray { - background-color: ${light.overlay}; + themeStyle = variant: '' + window#waybar > .horizontal { + background-color: ${variant.surface}; + border-color: ${variant.highlightHigh}; + color: ${variant.text}; } - #pulseaudio:hover { - background-color: ${light.highlightLow}; + #wireplumber:hover { + background-color: ${variant.highlightLow}; } ''; + in + { + "waybar/style-light.css".text = '' + ${baseStyle} + ${themeStyle light} + ''; "waybar/style-dark.css".text = '' ${baseStyle} - - window#waybar { - background-color: ${dark.base}; - color: ${dark.text}; - } - - #tray { - background-color: transparent; - } - - #pulseaudio:hover { - background-color: ${dark.highlightLow}; - } + ${themeStyle dark} ''; }; };