summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--accounts/gkleen@sif/default.nix5
-rw-r--r--overlays/wttrbar/default.nix7
-rw-r--r--overlays/wttrbar/icons.patch145
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 {
517 } 517 }
518 518
519 window#waybar { 519 window#waybar {
520 background-color: rgba(0, 0, 0, 0.5); 520 background-color: rgba(0, 0, 0, 0.66);
521 color: @white; 521 color: @white;
522 } 522 }
523 523
@@ -549,8 +549,7 @@ in {
549 } 549 }
550 550
551 #custom-weather, #custom-keymap { 551 #custom-weather, #custom-keymap {
552 color: @white; 552 color: @grey;
553 opacity: 0.33;
554 } 553 }
555 554
556 #tray { 555 #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 @@
1{ prev, ... }: {
2 wttrbar = prev.wttrbar.overrideAttrs (oldAttrs: {
3 patches = (oldAttrs.patches or []) ++ [
4 ./icons.patch
5 ];
6 });
7}
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 @@
1diff --git a/src/constants.rs b/src/constants.rs
2index 81b1926..36e26ac 100644
3--- a/src/constants.rs
4+++ b/src/constants.rs
5@@ -1,64 +1,52 @@
6 pub const WEATHER_CODES: &[(i32, &str)] = &[
7- (113, "☀ī¸"),
8- (116, "🌤ī¸"),
9- (119, "☁ī¸"),
10- (122, "đŸŒĨī¸"),
11- (143, "đŸŒĢī¸"),
12- (176, "đŸŒĻī¸"),
13- (179, "🌧ī¸"),
14- (182, "🌨ī¸"),
15- (185, "🌨ī¸"),
16- (200, "🌩ī¸"),
17- (227, "❄ī¸"),
18- (230, "❄ī¸"),
19- (248, "đŸŒĢī¸"),
20- (260, "đŸŒĢī¸"),
21- (263, "🌧ī¸"),
22- (266, "🌧ī¸"),
23- (281, "đŸŒĻī¸"),
24- (284, "đŸŒĻī¸"),
25- (293, "🌧ī¸"),
26- (296, "🌧ī¸"),
27- (299, "🌧ī¸"),
28- (302, "🌧ī¸"),
29- (305, "🌧ī¸"),
30- (308, "🌧ī¸"),
31- (311, "🌧ī¸"),
32- (314, "🌧ī¸"),
33- (317, "🌧ī¸"),
34- (320, "🌨ī¸"),
35- (323, "🌨ī¸"),
36- (326, "🌨ī¸"),
37- (329, "🌨ī¸"),
38- (332, "🌨ī¸"),
39- (335, "🌨ī¸"),
40- (338, "🌨ī¸"),
41- (350, "🌨ī¸"),
42- (353, "🌧ī¸"),
43- (356, "🌧ī¸"),
44- (359, "🌧ī¸"),
45- (362, "🌨ī¸"),
46- (365, "🌨ī¸"),
47- (368, "🌨ī¸"),
48- (371, "🌨ī¸"),
49- (374, "🌨ī¸"),
50- (377, "🌨ī¸"),
51- (386, "🌩ī¸"),
52- (389, "🌨ī¸"),
53- (392, "🌨ī¸"),
54- (395, "🌨ī¸"),
55- (398, "🌨ī¸"),
56- (401, "🌨ī¸"),
57- (404, "🌨ī¸"),
58- (407, "🌨ī¸"),
59- (410, "🌨ī¸"),
60- (413, "🌨ī¸"),
61- (416, "🌨ī¸"),
62- (419, "🌨ī¸"),
63- (422, "🌨ī¸"),
64- (425, "🌨ī¸"),
65- (428, "🌨ī¸"),
66- (431, "🌨ī¸"),
67+ (113, ""),
68+ (116, ""),
69+ (119, "îŒŊ"),
70+ (122, ""),
71+ (143, ""),
72+ (176, ""),
73+ (179, ""),
74+ (182, "îŽĒ"),
75+ (185, "îŽĒ"),
76+ (200, ""),
77+ (227, ""),
78+ (230, ""),
79+ (248, ""),
80+ (260, ""),
81+ (263, ""),
82+ (266, ""),
83+ (281, "îŽĒ"),
84+ (284, "îŽĒ"),
85+ (293, ""),
86+ (296, ""),
87+ (299, ""),
88+ (302, ""),
89+ (305, ""),
90+ (308, ""),
91+ (311, "îŽĒ"),
92+ (314, "îŽĒ"),
93+ (317, "îŽĒ"),
94+ (320, ""),
95+ (323, ""),
96+ (326, ""),
97+ (329, ""),
98+ (332, ""),
99+ (335, ""),
100+ (338, ""),
101+ (350, "îŽĒ"),
102+ (353, ""),
103+ (356, ""),
104+ (359, ""),
105+ (362, ""),
106+ (365, ""),
107+ (368, ""),
108+ (371, ""),
109+ (374, ""),
110+ (377, "îŽĒ"),
111+ (386, ""),
112+ (389, ""),
113+ (392, "îĨ"),
114+ (395, ""),
115 ];
116
117 pub const ICON_PLACEHOLDER: &str = "{ICON}";
118diff --git a/src/main.rs b/src/main.rs
119index 6ac4654..8f9ed6a 100644
120--- a/src/main.rs
121+++ b/src/main.rs
122@@ -175,20 +175,20 @@ fn main() {
123
124 if args.fahrenheit {
125 tooltip += &format!(
126- "âŦ†ī¸ {}° âŦ‡ī¸ {}° ",
127+ "ķ°¸ƒ {}° ķ°¸‚ {}° ",
128 day["maxtempF"].as_str().unwrap(),
129 day["mintempF"].as_str().unwrap(),
130 );
131 } else {
132 tooltip += &format!(
133- "âŦ†ī¸ {}° âŦ‡ī¸ {}° ",
134+ "ķ°¸ƒ {}° ķ°¸‚ {}° ",
135 day["maxtempC"].as_str().unwrap(),
136 day["mintempC"].as_str().unwrap(),
137 );
138 };
139
140 tooltip += &format!(
141- "🌅 {} 🌇 {}\n",
142+ " {}  {}\n",
143 format_ampm_time(day, "sunrise", args.ampm),
144 format_ampm_time(day, "sunset", args.ampm),
145 );