From 6a5a1b3771e8176acd16b83517d63088d3f355ce Mon Sep 17 00:00:00 2001
From: Matt Nish-Lapidus <matt@emenel.ca>
Date: Sun, 25 May 2025 18:24:35 -0400
Subject: [PATCH] waybar

---
 modules/home/waybar.nix | 36 ++++++++++++++++--------------------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/modules/home/waybar.nix b/modules/home/waybar.nix
index 1c1bf52..984737a 100644
--- a/modules/home/waybar.nix
+++ b/modules/home/waybar.nix
@@ -1,7 +1,7 @@
 { inputs, pkgs, ... }:
 with pkgs.lib.nix-rice;
 let strPalette = palette.toRGBHex pkgs.rice.colorPalette;
-    fnt = pkgs.rice.font.monospace.name;
+    fnt = pkgs.rice.font.propo.name;
 in {
 
   programs.waybar = {
@@ -182,7 +182,6 @@ in {
    #pulseaudio,
    #wireplumber,
    #disk,
-   #taskbar
    #cpu,
    #temperature,
    #custom-weather,
@@ -196,16 +195,15 @@ in {
    #memory
    #cpu
    #battery
-   #taskbar
    #tray
    #power-profiles-daemon
  */
 
 * {
   border: none;
-    font-size: 12pt;
-  font-family: "${fnt}" ;
-    min-height: 30px;
+  font-size: 12pt;
+  font-family: "BlexMono Nerd Font Propo" ;
+  min-height: 32px;
 }
 
 button:hover {
@@ -217,17 +215,13 @@ button:hover {
 
 window#waybar {
   background: ${strPalette.normal.background};
-  margin: 5px;
+  margin: 6px;
  }
 
 .module {
   margin: 0;
   padding: 0 18px;
   min-width: 1em;
-}
-
-.modules-left, .modules-right {
-  margin-top: 2px;
   color: #ccc;
 }
 
@@ -241,14 +235,21 @@ window#waybar {
 
 .modules-center {
   padding: 0 15px;
-  margin-top: 2px;
-  color: #ccc;
 }
 
 .modules-center .module {
   border: none;
 }
 
+#taskbar button {
+  margin: 0 3px;
+  padding: 3px 6px;
+}
+
+#taskbar button.active {
+  background: #333;
+}
+
 #taskbar > *:hover {
   border: none;
   box-shadow: none;
@@ -294,7 +295,7 @@ window#waybar {
 
 #workspaces button {
   color: #666;
-  padding: 0;
+  padding: 3px 6px;
 }
 
 #workspaces button:hover {
@@ -305,15 +306,10 @@ window#waybar {
   color: #222;
 }
 
-#workspaces button.focused
-{
+#workspaces button.focused {
   color: #ccc;
 }
 
-#taskbar button.active {
-  background: #333;
-}
-
 @keyframes blink {
   to {
     background-color: #ffffff;