From 288947cd6e1e5e07833f04c670ae9e01f0a8e748 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Sun, 12 Nov 2023 16:52:46 +0000
Subject: [PATCH] Make waybar a bit more compact / look nicer

---
 home/hyprland/waybar/default.nix | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/home/hyprland/waybar/default.nix b/home/hyprland/waybar/default.nix
index 0e0f4b3c..02f902d3 100644
--- a/home/hyprland/waybar/default.nix
+++ b/home/hyprland/waybar/default.nix
@@ -77,8 +77,8 @@
       };
       pulseaudio = {
         scroll-step = 5;
-        format = "{volume}% {icon} {format_source}";
-        format-muted = " 󰝟 {format_source}";
+        format = "{format_source}/{icon}:{volume}%";
+        format-muted = "{format_source}/󰝟";
         format-source = "󰍬";
         format-source-muted = "󰍭";
         format-icons = {
@@ -106,29 +106,29 @@
           warning = 30;
           critical = 15;
         };
-        format = "{capacity}% {icon}";
-        format-charging = "󰂄";
-        format-plugged = "󰚥";
-        tooltip-format = "{time} {capacity}%";
+        format = "{icon}:{capacity}%";
+        format-charging = "󰂄:{capacity}%";
+        format-plugged = "󰚥:{capacity}%";
+        tooltip-format = "{time}";
         format-icons = [ "󱃍" "󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹" ];
       };
       disk = {
-        format = "{percentage_used}% 󰋊";
+        format = "󰋊:{percentage_used}%";
         path = config.home.homeDirectory;
       };
       cpu = {
-        format = "{usage}% 󰻠";
+        format = "󰻠:{usage}%";
         tooltip = false;
       };
-      memory = { format = "{}% 󰍛"; };
+      memory = { format = "󰍛:{}%"; };
       temperature = {
         critical-threshold = 80;
-        format = "{temperatureC}°C {icon}";
+        format = "{icon}:{temperatureC}°C";
         format-icons = [ "󱃃" "󰔏" "󱃂" ];
       };
       clock = {
-        format = "{:%a %d %b %R}";
-        format-alt = "{:%A %F %T}";
+        format = "{:%R}";
+        format-alt = "{:%a %d %b %R}";
         tooltip-format = "<tt><small>{calendar}</small></tt>";
         calendar = {
           mode = "month";