From bfeba17a9b1edf8f34d734bddbb7ae9de2bd3668 Mon Sep 17 00:00:00 2001
From: notgne2 <gen2@gen2.space>
Date: Sun, 11 Dec 2022 20:44:44 -0700
Subject: [PATCH] make waybar tiny again

---
 home-manager/modules/ezpcusr.nix | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/home-manager/modules/ezpcusr.nix b/home-manager/modules/ezpcusr.nix
index 42c2a6c..dbf8ad2 100644
--- a/home-manager/modules/ezpcusr.nix
+++ b/home-manager/modules/ezpcusr.nix
@@ -320,13 +320,14 @@ in {
       };
 
       settings.mainbar = let
-        weatherCommand = f: "(${pkgs.curl}/bin/curl 'wttr.in/${cfg.location}?format=${f}' || echo 'ERR') | ${pkgs.gnused}/bin/sed 's/^Unknown.*/ERR/' | ${pkgs.coreutils}/bin/tr -s ' '";
+        # weatherCommand = f: "(${pkgs.curl}/bin/curl 'wttr.in/${cfg.location}?format=${f}' || echo 'ERR') | ${pkgs.gnused}/bin/sed 's/^Unknown.*/ERR/' | ${pkgs.coreutils}/bin/tr -s ' '";
+        weatherCommand = f: "(${pkgs.curl}/bin/curl 'wttr.in/${cfg.location}?format=${f}' || echo 'ERR') | ${pkgs.gnused}/bin/sed 's/^Unknown.*/ERR/' | ${pkgs.gnused}/bin/sed 's/[ +]//g'";
       in {
         position = lib.mkDefault "left";
         height = lib.mkDefault null;
 
         modules-left = ["sway/workspaces" "custom/spacer" "custom/weather-temp" "custom/weather-precip" "custom/weather-wind"];
-        modules-center = ["clock#1" "clock#2" "custom/spacer" "custom/media" "custom/spacer" "clock#3" "custom/spacer" "clock#4"];
+        modules-center = ["clock#1" "clock#2" "custom/spacer" "custom/media" "custom/spacer" "clock#3" "clock#4" "custom/spacer" "clock#5"];
         modules-right = ["pulseaudio" "custom/spacer" "memory" "custom/spacer" "cpu"] ++ lib.optionals cfg.battery ["custom/spacer" "battery"] ++ ["custom/spacer" "tray"];
 
         "custom/spacer" = {
@@ -375,12 +376,16 @@ in {
         };
         "clock#3" = {
           tooltip = lib.mkDefault false;
-          format = lib.mkDefault "{:%I:%M %p}";
+          format = lib.mkDefault "{:%I:%M}";
         };
         "clock#4" = {
+          tooltip = lib.mkDefault false;
+          format = lib.mkDefault "{:%p}";
+        };
+        "clock#5" = {
           tooltip = lib.mkDefault false;
           timezone = lib.mkDefault "Etc/UTC";
-          format = lib.mkDefault "{:%H:%M} UTC";
+          format = lib.mkDefault "{:%H%M}";
         };
 
         pulseaudio = {
@@ -439,6 +444,7 @@ in {
         #clock.2,
         #clock.3,
         #clock.4,
+        #clock.5,
         #pulseaudio,
         #memory,
         #cpu,
@@ -461,6 +467,9 @@ in {
         #clock.1 { padding: 5px 0 0 0; }
         #clock.2 { padding: 0 0 5px 0; }
 
+        #clock.3 { padding: 5px 0 0 0; }
+        #clock.4 { padding: 0 0 5px 0; }
+
         #custom-weather-temp { padding: 5px 0 0 0; }
         #custom-weather-precip { padding: 5px 0; }
         #custom-weather-wind { padding: 0 0 5px 0; }