3 files changed, 154 insertions, 3 deletions

diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index 0fe68a55..a29826b4 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -517,7 +517,7 @@ in {
             }
 
             window#waybar {
-              background-color: rgba(0, 0, 0, 0.5);
+              background-color: rgba(0, 0, 0, 0.66);
               color: @white;
             }
 
@@ -549,8 +549,7 @@ in {
             }
 
             #custom-weather, #custom-keymap {
-              color: @white;
-              opacity: 0.33;
+              color: @grey;
             }
 
             #tray {
diff --git a/overlays/wttrbar/default.nix b/overlays/wttrbar/default.nix
new file mode 100644
index 00000000..876fa699
--- /dev/null
+++ b/overlays/wttrbar/default.nix
@@ -0,0 +1,7 @@
+{ prev, ... }: {
+  wttrbar = prev.wttrbar.overrideAttrs (oldAttrs: {
+    patches = (oldAttrs.patches or []) ++ [
+      ./icons.patch
+    ];
+  });
+}
diff --git a/overlays/wttrbar/icons.patch b/overlays/wttrbar/icons.patch
new file mode 100644
index 00000000..9382ee88
--- /dev/null
+++ b/overlays/wttrbar/icons.patch
@@ -0,0 +1,145 @@
+diff --git a/src/constants.rs b/src/constants.rs
+index 81b1926..36e26ac 100644
+--- a/src/constants.rs
++++ b/src/constants.rs
+@@ -1,64 +1,52 @@
+ pub const WEATHER_CODES: &[(i32, &str)] = &[
+-    (113, "☀️"),
+-    (116, "🌤️"),
+-    (119, "☁️"),
+-    (122, "🌥️"),
+-    (143, "🌫️"),
+-    (176, "🌦️"),
+-    (179, "🌧️"),
+-    (182, "🌨️"),
+-    (185, "🌨️"),
+-    (200, "🌩️"),
+-    (227, "❄️"),
+-    (230, "❄️"),
+-    (248, "🌫️"),
+-    (260, "🌫️"),
+-    (263, "🌧️"),
+-    (266, "🌧️"),
+-    (281, "🌦️"),
+-    (284, "🌦️"),
+-    (293, "🌧️"),
+-    (296, "🌧️"),
+-    (299, "🌧️"),
+-    (302, "🌧️"),
+-    (305, "🌧️"),
+-    (308, "🌧️"),
+-    (311, "🌧️"),
+-    (314, "🌧️"),
+-    (317, "🌧️"),
+-    (320, "🌨️"),
+-    (323, "🌨️"),
+-    (326, "🌨️"),
+-    (329, "🌨️"),
+-    (332, "🌨️"),
+-    (335, "🌨️"),
+-    (338, "🌨️"),
+-    (350, "🌨️"),
+-    (353, "🌧️"),
+-    (356, "🌧️"),
+-    (359, "🌧️"),
+-    (362, "🌨️"),
+-    (365, "🌨️"),
+-    (368, "🌨️"),
+-    (371, "🌨️"),
+-    (374, "🌨️"),
+-    (377, "🌨️"),
+-    (386, "🌩️"),
+-    (389, "🌨️"),
+-    (392, "🌨️"),
+-    (395, "🌨️"),
+-    (398, "🌨️"),
+-    (401, "🌨️"),
+-    (404, "🌨️"),
+-    (407, "🌨️"),
+-    (410, "🌨️"),
+-    (413, "🌨️"),
+-    (416, "🌨️"),
+-    (419, "🌨️"),
+-    (422, "🌨️"),
+-    (425, "🌨️"),
+-    (428, "🌨️"),
+-    (431, "🌨️"),
++    (113, ""),
++    (116, ""),
++    (119, ""),
++    (122, ""),
++    (143, ""),
++    (176, ""),
++    (179, ""),
++    (182, ""),
++    (185, ""),
++    (200, ""),
++    (227, ""),
++    (230, ""),
++    (248, ""),
++    (260, ""),
++    (263, ""),
++    (266, ""),
++    (281, ""),
++    (284, ""),
++    (293, ""),
++    (296, ""),
++    (299, ""),
++    (302, ""),
++    (305, ""),
++    (308, ""),
++    (311, ""),
++    (314, ""),
++    (317, ""),
++    (320, ""),
++    (323, ""),
++    (326, ""),
++    (329, ""),
++    (332, ""),
++    (335, ""),
++    (338, ""),
++    (350, ""),
++    (353, ""),
++    (356, ""),
++    (359, ""),
++    (362, ""),
++    (365, ""),
++    (368, ""),
++    (371, ""),
++    (374, ""),
++    (377, ""),
++    (386, ""),
++    (389, ""),
++    (392, ""),
++    (395, ""),
+ ];
+ 
+ pub const ICON_PLACEHOLDER: &str = "{ICON}";
+diff --git a/src/main.rs b/src/main.rs
+index 6ac4654..8f9ed6a 100644
+--- a/src/main.rs
++++ b/src/main.rs
+@@ -175,20 +175,20 @@ fn main() {
+ 
+         if args.fahrenheit {
+             tooltip += &format!(
+-                "⬆️ {}° ⬇️ {}° ",
++                "󰸃 {}° 󰸂 {}° ",
+                 day["maxtempF"].as_str().unwrap(),
+                 day["mintempF"].as_str().unwrap(),
+             );
+         } else {
+             tooltip += &format!(
+-                "⬆️ {}° ⬇️ {}° ",
++                "󰸃 {}° 󰸂 {}° ",
+                 day["maxtempC"].as_str().unwrap(),
+                 day["mintempC"].as_str().unwrap(),
+             );
+         };
+ 
+         tooltip += &format!(
+-            "🌅 {} 🌇 {}\n",
++            " {}  {}\n",
+             format_ampm_time(day, "sunrise", args.ampm),
+             format_ampm_time(day, "sunset", args.ampm),
+         );