From cd9f4aeeba6bc6dd0819853c35476d5c905a94ca Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Wed, 29 Jan 2025 10:46:08 +0000
Subject: [PATCH] Waybar formatting updates

Split pulseaudio into 2 modules, remove most of the padding since it's
unnecessary, update colours for modules
---
 system/home/waybar.nix | 83 +++++++++++++-----------------------------
 1 file changed, 26 insertions(+), 57 deletions(-)

diff --git a/system/home/waybar.nix b/system/home/waybar.nix
index 929a219f..5c16e172 100644
--- a/system/home/waybar.nix
+++ b/system/home/waybar.nix
@@ -22,7 +22,8 @@
       "modules-center" = [ ];
       "modules-right" = [
         "custom/notification"
-        "pulseaudio"
+        "pulseaudio#source"
+        "pulseaudio#sink"
         "network"
         "bluetooth"
         "clock#calendar"
@@ -57,35 +58,6 @@
           "7" = [ ];
         };
       };
-      "hyprland/window" = {
-        "format" = "{title}";
-        "max-length" = 50;
-        "rewrite" = {
-          "(.*) - GNU Emacs at (.*)" = " $1 [$2]";
-          "(alacritty.*)" = " $1";
-          "(.*) - mpv" = "󰦟 $1";
-          "swayimg: (.*)" = "󰋩 $1";
-          "swappy" = "󰹑 swappy";
-          "(?:/nix/.*)(btm)" = " Resource Usage [$1]";
-          "(?:/nix/.*)(cava)" = "󰝚 Music Visualiser [$1]";
-          "Mozilla Firefox" = "󰈹 $1";
-          "(.*) — Mozilla Firefox" = "󰈹 $1";
-          "Nyxt - (.*)" = "󰀹 $1";
-          "(.*) - Chromium" = "󰊯 $1";
-          "(Signal.*)" = "󰭹 $1";
-          "(WhatsApp for Linux.*)" = "󰖣 $1";
-          "((?:.*)WebCord.*)" = "󰙯 $1";
-          "(Cartridges.*)" = "󰊗 $1";
-          "([Ss]team.*)" = "󰓓 $1";
-          "(Prism Launcher.*)" = "󰍳 Minecraft ($1)";
-          "(.*)(?: *)PrusaSlicer-(.*)" = "󰐫 $1 PrusaSlicer ($2)";
-          "(.*)(?: *)PrusaSlicer G-code Viewer-(.*)" = "󰹛 $1 G-code Viewer ($2)";
-          "FreeCAD (.*)" = "󰻬 FreeCAD $1";
-          "(.*) - Blender.* " = "󰂫 $1";
-          "(Remmina Remote Desktop Client)" = "󰢹 $1";
-          "(NoMachine|Nxplayer.bin)(?: *)(.*)" = "󰢹 $1 $2";
-        };
-      };
       mpris = {
         "format" = "{player_icon}\n{status_icon}";
         "tooltip-format" = "{player_icon} ({player}) {status_icon}\n{title}\n{album}\n{artist}";
@@ -110,12 +82,21 @@
           "firefox"
         ];
       };
-      pulseaudio = {
+      "pulseaudio#source" = {
         scroll-step = 5;
-        format = "{format_source}\n{icon}";
-        # format-muted = "{format_source} {icon}";
+        format = "{format_source}";
         format-source = "󰍬";
         format-source-muted = "󰍭";
+        tooltip = true;
+        tooltip-format = "{desc} ({volume}%)";
+        on-click = "${pkgs.pavucontrol}/bin/pavucontrol";
+        on-click-right = "${config.services.avizo.package}/bin/volumectl %";
+        on-scroll-up = "${config.services.avizo.package}/bin/volumectl -u + 5";
+        on-scroll-down = "${config.services.avizo.package}/bin/volumectl -u - 5";
+      };
+      "pulseaudio#sink" = {
+        scroll-step = 5;
+        format = "{icon}";
         format-icons = {
           car = "󰄍";
           default = [
@@ -165,7 +146,7 @@
           size = "${toString config.stylix.fonts.sizes.popups}pt";
         in
         {
-          format = "󰃭";
+          format = "{:%y\n%m\n%d}";
           tooltip-format = "<span size='${size}'>{calendar}</span>";
           calendar = {
             mode = "month";
@@ -216,8 +197,6 @@
         format-time = "{H}:{m}";
         format-charging = "󰂄";
         format-plugged = "󰚥";
-        # format-warning = "{icon}{capacity}%";
-        # format-critical = "{icon}{capacity}% ({time})";
         tooltip-format = "{capacity}% | {power}W | {time}";
         format-icons = [
           "󱃍"
@@ -311,22 +290,6 @@
             margin: 0px;
         }
 
-        #workspaces,
-        #window,
-        #mpris,
-        #custom-notification,
-        #pulseaudio,
-        #network,
-        #bluetooth,
-        #clock,
-        #backlight,
-        #battery,
-        #custom-weather,
-        #tray {
-            margin: 0px;
-            padding: 2px 4px 2px 3px;
-        }
-
         #workspaces {
             background: ${scheme.base00};
             border-radius: 5px;
@@ -351,21 +314,27 @@
         #custom-notification {
             color: ${scheme.base08};
         }
-        #pulseaudio {
+        #pulseaudio.source {
             color: ${scheme.base09};
         }
-        #network {
+        #pulseaudio.sink {
             color: ${scheme.base0A};
         }
-        #bluetooth {
+        #network {
             color: ${scheme.base0B};
         }
-        #clock.calendar {
+        #bluetooth {
             color: ${scheme.base0C};
         }
-        #clock {
+        #clock.calendar {
             color: ${scheme.base0D};
         }
+        #clock {
+            color: ${scheme.base0E};
+        }
+        #backlight {
+            color: ${scheme.base0F};
+        }
 
         #battery.warning {
             color: ${scheme.base09};