summaryrefslogtreecommitdiff
path: root/overlays
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2024-08-15 16:09:28 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2024-08-15 16:09:28 +0200
commite14ab1ddf1c86ab7522288724acc51d5a22062e3 (patch)
tree43b0a8e740bd64cf58030d96c09c05357d5cc842 /overlays
parentac8c678806288df395a87deb15491a2c8c1423a0 (diff)
downloadnixos-e14ab1ddf1c86ab7522288724acc51d5a22062e3.tar
nixos-e14ab1ddf1c86ab7522288724acc51d5a22062e3.tar.gz
nixos-e14ab1ddf1c86ab7522288724acc51d5a22062e3.tar.bz2
nixos-e14ab1ddf1c86ab7522288724acc51d5a22062e3.tar.xz
nixos-e14ab1ddf1c86ab7522288724acc51d5a22062e3.zip
...
Diffstat (limited to 'overlays')
-rw-r--r--overlays/nerdfonts.nix2
-rw-r--r--overlays/wttrbar/icons.patch115
2 files changed, 63 insertions, 54 deletions
diff --git a/overlays/nerdfonts.nix b/overlays/nerdfonts.nix
index 2b73bad3..3e5ac9a2 100644
--- a/overlays/nerdfonts.nix
+++ b/overlays/nerdfonts.nix
@@ -1,5 +1,5 @@
1{ prev, ... }: { 1{ prev, ... }: {
2 nerdfonts = prev.nerdfonts.override { 2 nerdfonts = prev.nerdfonts.override {
3 fonts = ["FiraMono" "FiraCode"]; 3 fonts = ["FiraMono" "FiraCode" "NerdFontsSymbolsOnly"];
4 }; 4 };
5} 5}
diff --git a/overlays/wttrbar/icons.patch b/overlays/wttrbar/icons.patch
index 9382ee88..e7e721c8 100644
--- a/overlays/wttrbar/icons.patch
+++ b/overlays/wttrbar/icons.patch
@@ -1,5 +1,5 @@
1diff --git a/src/constants.rs b/src/constants.rs 1diff --git a/src/constants.rs b/src/constants.rs
2index 81b1926..36e26ac 100644 2index 81b1926..3619d8f 100644
3--- a/src/constants.rs 3--- a/src/constants.rs
4+++ b/src/constants.rs 4+++ b/src/constants.rs
5@@ -1,64 +1,52 @@ 5@@ -1,64 +1,52 @@
@@ -64,59 +64,59 @@ index 81b1926..36e26ac 100644
64- (425, "🌨️"), 64- (425, "🌨️"),
65- (428, "🌨️"), 65- (428, "🌨️"),
66- (431, "🌨️"), 66- (431, "🌨️"),
67+ (113, ""), 67+ (113, "<span font=\"Symbols Nerd Font Mono\"></span>"),
68+ (116, ""), 68+ (116, "<span font=\"Symbols Nerd Font Mono\"></span>"),
69+ (119, ""), 69+ (119, "<span font=\"Symbols Nerd Font Mono\"></span>"),
70+ (122, ""), 70+ (122, "<span font=\"Symbols Nerd Font Mono\"></span>"),
71+ (143, ""), 71+ (143, "<span font=\"Symbols Nerd Font Mono\"></span>"),
72+ (176, ""), 72+ (176, "<span font=\"Symbols Nerd Font Mono\"></span>"),
73+ (179, ""), 73+ (179, "<span font=\"Symbols Nerd Font Mono\"></span>"),
74+ (182, ""), 74+ (182, "<span font=\"Symbols Nerd Font Mono\"></span>"),
75+ (185, ""), 75+ (185, "<span font=\"Symbols Nerd Font Mono\"></span>"),
76+ (200, ""), 76+ (200, "<span font=\"Symbols Nerd Font Mono\"></span>"),
77+ (227, ""), 77+ (227, "<span font=\"Symbols Nerd Font Mono\"></span>"),
78+ (230, ""), 78+ (230, "<span font=\"Symbols Nerd Font Mono\"></span>"),
79+ (248, ""), 79+ (248, "<span font=\"Symbols Nerd Font Mono\"></span>"),
80+ (260, ""), 80+ (260, "<span font=\"Symbols Nerd Font Mono\"></span>"),
81+ (263, ""), 81+ (263, "<span font=\"Symbols Nerd Font Mono\"></span>"),
82+ (266, ""), 82+ (266, "<span font=\"Symbols Nerd Font Mono\"></span>"),
83+ (281, ""), 83+ (281, "<span font=\"Symbols Nerd Font Mono\"></span>"),
84+ (284, ""), 84+ (284, "<span font=\"Symbols Nerd Font Mono\"></span>"),
85+ (293, ""), 85+ (293, "<span font=\"Symbols Nerd Font Mono\"></span>"),
86+ (296, ""), 86+ (296, "<span font=\"Symbols Nerd Font Mono\"></span>"),
87+ (299, ""), 87+ (299, "<span font=\"Symbols Nerd Font Mono\"></span>"),
88+ (302, ""), 88+ (302, "<span font=\"Symbols Nerd Font Mono\"></span>"),
89+ (305, ""), 89+ (305, "<span font=\"Symbols Nerd Font Mono\"></span>"),
90+ (308, ""), 90+ (308, "<span font=\"Symbols Nerd Font Mono\"></span>"),
91+ (311, ""), 91+ (311, "<span font=\"Symbols Nerd Font Mono\"></span>"),
92+ (314, ""), 92+ (314, "<span font=\"Symbols Nerd Font Mono\"></span>"),
93+ (317, ""), 93+ (317, "<span font=\"Symbols Nerd Font Mono\"></span>"),
94+ (320, ""), 94+ (320, "<span font=\"Symbols Nerd Font Mono\"></span>"),
95+ (323, ""), 95+ (323, "<span font=\"Symbols Nerd Font Mono\"></span>"),
96+ (326, ""), 96+ (326, "<span font=\"Symbols Nerd Font Mono\"></span>"),
97+ (329, ""), 97+ (329, "<span font=\"Symbols Nerd Font Mono\"></span>"),
98+ (332, ""), 98+ (332, "<span font=\"Symbols Nerd Font Mono\"></span>"),
99+ (335, ""), 99+ (335, "<span font=\"Symbols Nerd Font Mono\"></span>"),
100+ (338, ""), 100+ (338, "<span font=\"Symbols Nerd Font Mono\"></span>"),
101+ (350, ""), 101+ (350, "<span font=\"Symbols Nerd Font Mono\"></span>"),
102+ (353, ""), 102+ (353, "<span font=\"Symbols Nerd Font Mono\"></span>"),
103+ (356, ""), 103+ (356, "<span font=\"Symbols Nerd Font Mono\"></span>"),
104+ (359, ""), 104+ (359, "<span font=\"Symbols Nerd Font Mono\"></span>"),
105+ (362, ""), 105+ (362, "<span font=\"Symbols Nerd Font Mono\"></span>"),
106+ (365, ""), 106+ (365, "<span font=\"Symbols Nerd Font Mono\"></span>"),
107+ (368, ""), 107+ (368, "<span font=\"Symbols Nerd Font Mono\"></span>"),
108+ (371, ""), 108+ (371, "<span font=\"Symbols Nerd Font Mono\"></span>"),
109+ (374, ""), 109+ (374, "<span font=\"Symbols Nerd Font Mono\"></span>"),
110+ (377, ""), 110+ (377, "<span font=\"Symbols Nerd Font Mono\"></span>"),
111+ (386, ""), 111+ (386, "<span font=\"Symbols Nerd Font Mono\"></span>"),
112+ (389, ""), 112+ (389, "<span font=\"Symbols Nerd Font Mono\"></span>"),
113+ (392, ""), 113+ (392, "<span font=\"Symbols Nerd Font Mono\"></span>"),
114+ (395, ""), 114+ (395, "<span font=\"Symbols Nerd Font Mono\"></span>"),
115 ]; 115 ];
116 116
117 pub const ICON_PLACEHOLDER: &str = "{ICON}"; 117 pub const ICON_PLACEHOLDER: &str = "{ICON}";
118diff --git a/src/main.rs b/src/main.rs 118diff --git a/src/main.rs b/src/main.rs
119index 6ac4654..8f9ed6a 100644 119index 6ac4654..1b84207 100644
120--- a/src/main.rs 120--- a/src/main.rs
121+++ b/src/main.rs 121+++ b/src/main.rs
122@@ -175,20 +175,20 @@ fn main() { 122@@ -175,20 +175,20 @@ fn main() {
@@ -124,14 +124,14 @@ index 6ac4654..8f9ed6a 100644
124 if args.fahrenheit { 124 if args.fahrenheit {
125 tooltip += &format!( 125 tooltip += &format!(
126- "⬆️ {}° ⬇️ {}° ", 126- "⬆️ {}° ⬇️ {}° ",
127+ "󰸃 {}° 󰸂 {}° ", 127+ "<span font=\"Symbols Nerd Font Mono\">󰸃</span> {}° <span font=\"Symbols Nerd Font Mono\">󰸂</span> {}° ",
128 day["maxtempF"].as_str().unwrap(), 128 day["maxtempF"].as_str().unwrap(),
129 day["mintempF"].as_str().unwrap(), 129 day["mintempF"].as_str().unwrap(),
130 ); 130 );
131 } else { 131 } else {
132 tooltip += &format!( 132 tooltip += &format!(
133- "⬆️ {}° ⬇️ {}° ", 133- "⬆️ {}° ⬇️ {}° ",
134+ "󰸃 {}° 󰸂 {}° ", 134+ "<span font=\"Symbols Nerd Font Mono\">󰸃</span> {}° <span font=\"Symbols Nerd Font Mono\">󰸂</span> {}° ",
135 day["maxtempC"].as_str().unwrap(), 135 day["maxtempC"].as_str().unwrap(),
136 day["mintempC"].as_str().unwrap(), 136 day["mintempC"].as_str().unwrap(),
137 ); 137 );
@@ -139,7 +139,16 @@ index 6ac4654..8f9ed6a 100644
139 139
140 tooltip += &format!( 140 tooltip += &format!(
141- "🌅 {} 🌇 {}\n", 141- "🌅 {} 🌇 {}\n",
142+ " {}  {}\n", 142+ "<span font=\"Symbols Nerd Font Mono\"></span> {} <span font=\"Symbols Nerd Font Mono\"></span> {}\n",
143 format_ampm_time(day, "sunrise", args.ampm), 143 format_ampm_time(day, "sunrise", args.ampm),
144 format_ampm_time(day, "sunset", args.ampm), 144 format_ampm_time(day, "sunset", args.ampm),
145 ); 145 );
146@@ -207,7 +207,7 @@ fn main() {
147 }
148
149 let mut tooltip_line = format!(
150- "{} {} {} {}",
151+ "{} {}{} {}",
152 format_time(hour["time"].as_str().unwrap(), args.ampm),
153 WEATHER_CODES
154 .iter()