...

author: Gregor Kleen <gkleen@yggdrasil.li> 2024-08-14 02:50:57 +0200
committer: Gregor Kleen <gkleen@yggdrasil.li> 2024-08-14 02:50:57 +0200
commit: 943bd8277c7f265b335035607aac59299d1fa9f1 (patch)
tree: 6d22ab016e5f983f04abf245bb0e3eae77cd1b57 /overlays
parent: 93c85b7faaf47cac9bcef2434cd46dc64a9c8ccb (diff)
download: nixos-943bd8277c7f265b335035607aac59299d1fa9f1.tar
nixos-943bd8277c7f265b335035607aac59299d1fa9f1.tar.gz
nixos-943bd8277c7f265b335035607aac59299d1fa9f1.tar.bz2
nixos-943bd8277c7f265b335035607aac59299d1fa9f1.tar.xz
nixos-943bd8277c7f265b335035607aac59299d1fa9f1.zip
2 files changed, 152 insertions, 0 deletions
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),
+         );
author	Gregor Kleen <gkleen@yggdrasil.li>	2024-08-14 02:50:57 +0200
committer	Gregor Kleen <gkleen@yggdrasil.li>	2024-08-14 02:50:57 +0200
commit	943bd8277c7f265b335035607aac59299d1fa9f1 (patch)
tree	6d22ab016e5f983f04abf245bb0e3eae77cd1b57 /overlays
parent	93c85b7faaf47cac9bcef2434cd46dc64a9c8ccb (diff)
download	nixos-943bd8277c7f265b335035607aac59299d1fa9f1.tar nixos-943bd8277c7f265b335035607aac59299d1fa9f1.tar.gz nixos-943bd8277c7f265b335035607aac59299d1fa9f1.tar.bz2 nixos-943bd8277c7f265b335035607aac59299d1fa9f1.tar.xz nixos-943bd8277c7f265b335035607aac59299d1fa9f1.zip

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 @@
	1	diff --git a/src/constants.rs b/src/constants.rs
	2	index 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}";
	118	diff --git a/src/main.rs b/src/main.rs
	119	index 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	);