summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--_sources/generated.json8
-rw-r--r--_sources/generated.nix8
-rw-r--r--accounts/gkleen@sif/default.nix4
-rw-r--r--flake.lock80
-rw-r--r--flake.nix6
-rw-r--r--hosts/vidhar/default.nix2
-rw-r--r--modules/uucp.nix27
-rw-r--r--overlays/uucp/default.nix9
-rw-r--r--overlays/uucp/mailprogram.patch16
-rw-r--r--overlays/wttrbar/default.nix7
-rw-r--r--overlays/wttrbar/icons.patch154
11 files changed, 81 insertions, 240 deletions
diff --git a/_sources/generated.json b/_sources/generated.json
index 0e375871..47e088c4 100644
--- a/_sources/generated.json
+++ b/_sources/generated.json
@@ -36,7 +36,7 @@
36 }, 36 },
37 "bpf-examples": { 37 "bpf-examples": {
38 "cargoLocks": null, 38 "cargoLocks": null,
39 "date": "2024-01-31", 39 "date": "2025-01-03",
40 "extract": null, 40 "extract": null,
41 "name": "bpf-examples", 41 "name": "bpf-examples",
42 "passthru": null, 42 "passthru": null,
@@ -48,12 +48,12 @@
48 "name": null, 48 "name": null,
49 "owner": "xdp-project", 49 "owner": "xdp-project",
50 "repo": "bpf-examples", 50 "repo": "bpf-examples",
51 "rev": "5343ed3377471c7b7ef2237526c8bdc0f00a0cef", 51 "rev": "8d53e6fc46ae625bd16b38eb1007ece99460eada",
52 "sha256": "sha256-vKVI8pQ17BNWLKm8wwpyNkLslnB9E2CAZTS6EP5lDT0=", 52 "sha256": "sha256-BUncjyaywmtSMVhbWZDy9XiNlGJet8Z0lzmUqm3f+HU=",
53 "sparseCheckout": [], 53 "sparseCheckout": [],
54 "type": "github" 54 "type": "github"
55 }, 55 },
56 "version": "5343ed3377471c7b7ef2237526c8bdc0f00a0cef" 56 "version": "8d53e6fc46ae625bd16b38eb1007ece99460eada"
57 }, 57 },
58 "emacs-scratch_el": { 58 "emacs-scratch_el": {
59 "cargoLocks": null, 59 "cargoLocks": null,
diff --git a/_sources/generated.nix b/_sources/generated.nix
index 1f828220..161dc4e1 100644
--- a/_sources/generated.nix
+++ b/_sources/generated.nix
@@ -26,15 +26,15 @@
26 }; 26 };
27 bpf-examples = { 27 bpf-examples = {
28 pname = "bpf-examples"; 28 pname = "bpf-examples";
29 version = "5343ed3377471c7b7ef2237526c8bdc0f00a0cef"; 29 version = "8d53e6fc46ae625bd16b38eb1007ece99460eada";
30 src = fetchFromGitHub { 30 src = fetchFromGitHub {
31 owner = "xdp-project"; 31 owner = "xdp-project";
32 repo = "bpf-examples"; 32 repo = "bpf-examples";
33 rev = "5343ed3377471c7b7ef2237526c8bdc0f00a0cef"; 33 rev = "8d53e6fc46ae625bd16b38eb1007ece99460eada";
34 fetchSubmodules = true; 34 fetchSubmodules = true;
35 sha256 = "sha256-vKVI8pQ17BNWLKm8wwpyNkLslnB9E2CAZTS6EP5lDT0="; 35 sha256 = "sha256-BUncjyaywmtSMVhbWZDy9XiNlGJet8Z0lzmUqm3f+HU=";
36 }; 36 };
37 date = "2024-01-31"; 37 date = "2025-01-03";
38 }; 38 };
39 emacs-scratch_el = { 39 emacs-scratch_el = {
40 pname = "emacs-scratch_el"; 40 pname = "emacs-scratch_el";
diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index 68faa201..23525791 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -160,7 +160,7 @@ in {
160 yaml-mode json-mode shakespeare-mode smart-mode-line 160 yaml-mode json-mode shakespeare-mode smart-mode-line
161 highlight-parentheses highlight-symbol ag sass-mode lua-mode 161 highlight-parentheses highlight-symbol ag sass-mode lua-mode
162 fira-code-mode use-package wanderlust # notmuch 162 fira-code-mode use-package wanderlust # notmuch
163 use-package-ensure-system-package git-gutter emacsScratch 163 git-gutter emacsScratch
164 edit-server mediawiki editorconfig typescript-mode 164 edit-server mediawiki editorconfig typescript-mode
165 markdown-mode nftables-mode rustic lsp-mode lsp-ui 165 markdown-mode nftables-mode rustic lsp-mode lsp-ui
166 direnv company projectile tomorrow-night-paradise-theme 166 direnv company projectile tomorrow-night-paradise-theme
@@ -278,7 +278,7 @@ in {
278 format = "{}"; 278 format = "{}";
279 tooltip = true; 279 tooltip = true;
280 interval = 3600; 280 interval = 3600;
281 exec = "${lib.getExe pkgs.wttrbar} --hide-conditions --custom-indicator \"<span font=\\\"Symbols Nerd Font Mono\\\" size=\\\"120%\\\">{ICON}</span> {FeelsLikeC}°\""; 281 exec = "${lib.getExe pkgs.wttrbar} --hide-conditions --nerd --custom-indicator \"<span font=\\\"Symbols Nerd Font Mono\\\" size=\\\"120%\\\">{ICON}</span> {FeelsLikeC}°\"";
282 return-type = "json"; 282 return-type = "json";
283 }; 283 };
284 "custom/keymap" = { 284 "custom/keymap" = {
diff --git a/flake.lock b/flake.lock
index 56b571ca..ad8b803f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -168,11 +168,11 @@
168 "nixpkgs-lib": "nixpkgs-lib_2" 168 "nixpkgs-lib": "nixpkgs-lib_2"
169 }, 169 },
170 "locked": { 170 "locked": {
171 "lastModified": 1726153070, 171 "lastModified": 1733312601,
172 "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", 172 "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
173 "owner": "hercules-ci", 173 "owner": "hercules-ci",
174 "repo": "flake-parts", 174 "repo": "flake-parts",
175 "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", 175 "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
176 "type": "github" 176 "type": "github"
177 }, 177 },
178 "original": { 178 "original": {
@@ -202,11 +202,11 @@
202 "flake-registry": { 202 "flake-registry": {
203 "flake": false, 203 "flake": false,
204 "locked": { 204 "locked": {
205 "lastModified": 1717415742, 205 "lastModified": 1734450202,
206 "narHash": "sha256-HKvoLGZUsBpjkxWkdtctGYj6RH0bl6vcw0OjTOqyzJk=", 206 "narHash": "sha256-/3gigrEBFORQs6a8LL5twoHs7biu08y/8Xc5aQmk3b0=",
207 "owner": "NixOS", 207 "owner": "NixOS",
208 "repo": "flake-registry", 208 "repo": "flake-registry",
209 "rev": "895a65f8d5acf848136ee8fe8e8f736f0d27df96", 209 "rev": "02fe640c9e117dd9d6a34efc7bcb8bd09c08111d",
210 "type": "github" 210 "type": "github"
211 }, 211 },
212 "original": { 212 "original": {
@@ -322,11 +322,11 @@
322 ] 322 ]
323 }, 323 },
324 "locked": { 324 "locked": {
325 "lastModified": 1722322032, 325 "lastModified": 1736014120,
326 "narHash": "sha256-pnO44gA8GcJj3oCVeGmypSGLr10+usMbJXochJWdugw=", 326 "narHash": "sha256-ZrI+mcuQfal5IfT4HsxVEiiFNAgV4qYh+B4/NyXxpAs=",
327 "owner": "gkleen", 327 "owner": "gkleen",
328 "repo": "home-manager", 328 "repo": "home-manager",
329 "rev": "55c1d61f06fd331f874178a6028f22be22ee7878", 329 "rev": "99e8412a18eb7e0731aa2b77abeed00d6d1863ad",
330 "type": "github" 330 "type": "github"
331 }, 331 },
332 "original": { 332 "original": {
@@ -359,11 +359,11 @@
359 }, 359 },
360 "impermanence": { 360 "impermanence": {
361 "locked": { 361 "locked": {
362 "lastModified": 1731242966, 362 "lastModified": 1734945620,
363 "narHash": "sha256-B3C3JLbGw0FtLSWCjBxU961gLNv+BOOBC6WvstKLYMw=", 363 "narHash": "sha256-olIfsfJK4/GFmPH8mXMmBDAkzVQ1TWJmeGT3wBGfQPY=",
364 "owner": "nix-community", 364 "owner": "nix-community",
365 "repo": "impermanence", 365 "repo": "impermanence",
366 "rev": "3ed3f0eaae9fcc0a8331e77e9319c8a4abd8a71a", 366 "rev": "d000479f4f41390ff7cf9204979660ad5dd16176",
367 "type": "github" 367 "type": "github"
368 }, 368 },
369 "original": { 369 "original": {
@@ -413,11 +413,11 @@
413 ] 413 ]
414 }, 414 },
415 "locked": { 415 "locked": {
416 "lastModified": 1733629314, 416 "lastModified": 1735443188,
417 "narHash": "sha256-U0vivjQFAwjNDYt49Krevs1murX9hKBFe2Ye0cHpgbU=", 417 "narHash": "sha256-AydPpRBh8+NOkrLylG7vTsHrGO2b5L7XkMEL5HlzcA8=",
418 "owner": "Mic92", 418 "owner": "Mic92",
419 "repo": "nix-index-database", 419 "repo": "nix-index-database",
420 "rev": "f1e477a7dd11e27e7f98b646349cd66bbabf2fb8", 420 "rev": "55ab1e1df5daf2476e6b826b69a82862dcbd7544",
421 "type": "github" 421 "type": "github"
422 }, 422 },
423 "original": { 423 "original": {
@@ -434,11 +434,11 @@
434 ] 434 ]
435 }, 435 },
436 "locked": { 436 "locked": {
437 "lastModified": 1732406038, 437 "lastModified": 1735412232,
438 "narHash": "sha256-BYNBN+Rtc/SX6qI7m3nmryufRPn0ZYd40yHDo9VQaNE=", 438 "narHash": "sha256-W9wRlNvQLfV21359gTr3DglRBA6Q7NPUSU4RzgAAGsk=",
439 "owner": "AshleyYakeley", 439 "owner": "AshleyYakeley",
440 "repo": "NixVirt", 440 "repo": "NixVirt",
441 "rev": "fe3aaa86d4458e4f84348941297f7ba82e2a9f67", 441 "rev": "55367360c00bd304042e5ad90841fd399330b77a",
442 "type": "github" 442 "type": "github"
443 }, 443 },
444 "original": { 444 "original": {
@@ -449,11 +449,11 @@
449 }, 449 },
450 "nixos-hardware": { 450 "nixos-hardware": {
451 "locked": { 451 "locked": {
452 "lastModified": 1733861262, 452 "lastModified": 1735388221,
453 "narHash": "sha256-+jjPup/ByS0LEVIrBbt7FnGugJgLeG9oc+ivFASYn2U=", 453 "narHash": "sha256-e5IOgjQf0SZcFCEV/gMGrsI0gCJyqOKShBQU0iiM3Kg=",
454 "owner": "NixOS", 454 "owner": "NixOS",
455 "repo": "nixos-hardware", 455 "repo": "nixos-hardware",
456 "rev": "cf737e2eba82b603f54f71b10cb8fd09d22ce3f5", 456 "rev": "7c674c6734f61157e321db595dbfcd8523e04e19",
457 "type": "github" 457 "type": "github"
458 }, 458 },
459 "original": { 459 "original": {
@@ -509,14 +509,14 @@
509 }, 509 },
510 "nixpkgs-lib_2": { 510 "nixpkgs-lib_2": {
511 "locked": { 511 "locked": {
512 "lastModified": 1725233747, 512 "lastModified": 1733096140,
513 "narHash": "sha256-Ss8QWLXdr2JCBPcYChJhz4xJm+h/xjl4G0c0XlP6a74=", 513 "narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=",
514 "type": "tarball", 514 "type": "tarball",
515 "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" 515 "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz"
516 }, 516 },
517 "original": { 517 "original": {
518 "type": "tarball", 518 "type": "tarball",
519 "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" 519 "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz"
520 } 520 }
521 }, 521 },
522 "nixpkgs-lib_3": { 522 "nixpkgs-lib_3": {
@@ -603,16 +603,16 @@
603 }, 603 },
604 "nixpkgs_2": { 604 "nixpkgs_2": {
605 "locked": { 605 "locked": {
606 "lastModified": 1733759999, 606 "lastModified": 1736013918,
607 "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", 607 "narHash": "sha256-5nGpp/IkUczGOu/flzHO+C05K3QljD5KuQUS/c2ZjUY=",
608 "owner": "NixOS", 608 "owner": "gkleen",
609 "repo": "nixpkgs", 609 "repo": "nixpkgs",
610 "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", 610 "rev": "3a711bcb55711f7ed475c618e77c45e69a54732d",
611 "type": "github" 611 "type": "github"
612 }, 612 },
613 "original": { 613 "original": {
614 "owner": "NixOS", 614 "owner": "gkleen",
615 "ref": "nixos-unstable", 615 "ref": "fix/matrix-synapse",
616 "repo": "nixpkgs", 616 "repo": "nixpkgs",
617 "type": "github" 617 "type": "github"
618 } 618 }
@@ -673,11 +673,11 @@
673 "treefmt-nix": "treefmt-nix" 673 "treefmt-nix": "treefmt-nix"
674 }, 674 },
675 "locked": { 675 "locked": {
676 "lastModified": 1731205797, 676 "lastModified": 1735852239,
677 "narHash": "sha256-F7N1mxH1VrkVNHR3JGNMRvp9+98KYO4b832KS8Gl2xI=", 677 "narHash": "sha256-Xrg/HahR9SW1UzT5pwtpQR6D12ZIwwHjxav9YzB1q4U=",
678 "owner": "nix-community", 678 "owner": "nix-community",
679 "repo": "poetry2nix", 679 "repo": "poetry2nix",
680 "rev": "f554d27c1544d9c56e5f1f8e2b8aff399803674e", 680 "rev": "bb182fd661f5f8a7d6c50dd44cf9a6ddca7ccc1a",
681 "type": "github" 681 "type": "github"
682 }, 682 },
683 "original": { 683 "original": {
@@ -722,11 +722,11 @@
722 ] 722 ]
723 }, 723 },
724 "locked": { 724 "locked": {
725 "lastModified": 1726745158, 725 "lastModified": 1734261738,
726 "narHash": "sha256-D5AegvGoEjt4rkKedmxlSEmC+nNLMBPWFxvmYnVLhjk=", 726 "narHash": "sha256-3Lzk+7QyX8v60+km26D3dln7NMSA13vW+KYTkMkds6Q=",
727 "owner": "cachix", 727 "owner": "cachix",
728 "repo": "pre-commit-hooks.nix", 728 "repo": "pre-commit-hooks.nix",
729 "rev": "4e743a6920eab45e8ba0fbe49dc459f1423a4b74", 729 "rev": "4c8e75efbbdcc6f9203f64b1f21f8a55d2285264",
730 "type": "github" 730 "type": "github"
731 }, 731 },
732 "original": { 732 "original": {
@@ -815,11 +815,11 @@
815 ] 815 ]
816 }, 816 },
817 "locked": { 817 "locked": {
818 "lastModified": 1733965552, 818 "lastModified": 1735844895,
819 "narHash": "sha256-GZ4YtqkfyTjJFVCub5yAFWsHknG1nS/zfk7MuHht4Fs=", 819 "narHash": "sha256-CIRlqX9tBK2awJkmVu2cKuap/0QziDXStQZ/u/+e8Z4=",
820 "owner": "Mic92", 820 "owner": "Mic92",
821 "repo": "sops-nix", 821 "repo": "sops-nix",
822 "rev": "2d73fc6ac4eba4b9a83d3cb8275096fbb7ab4004", 822 "rev": "24d89184adf76d7ccc99e659dc5f3838efb5ee32",
823 "type": "github" 823 "type": "github"
824 }, 824 },
825 "original": { 825 "original": {
diff --git a/flake.nix b/flake.nix
index cd50543e..c6eaab47 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,9 +13,11 @@
13 inputs = { 13 inputs = {
14 nixpkgs = { 14 nixpkgs = {
15 type = "github"; 15 type = "github";
16 owner = "NixOS"; 16 # owner = "NixOS";
17 repo = "nixpkgs"; 17 repo = "nixpkgs";
18 ref = "nixos-unstable"; 18 # ref = "nixos-unstable";
19 owner = "gkleen";
20 ref = "fix/matrix-synapse";
19 }; 21 };
20 nixpkgs-pgbackrest = { 22 nixpkgs-pgbackrest = {
21 type = "github"; 23 type = "github";
diff --git a/hosts/vidhar/default.nix b/hosts/vidhar/default.nix
index d9bc53f2..b0797d8a 100644
--- a/hosts/vidhar/default.nix
+++ b/hosts/vidhar/default.nix
@@ -136,7 +136,7 @@ with lib;
136 wantedBy = ["basic.target"]; 136 wantedBy = ["basic.target"];
137 serviceConfig = { 137 serviceConfig = {
138 ExecStart = pkgs.writeShellScript "limit-pstate-start" '' 138 ExecStart = pkgs.writeShellScript "limit-pstate-start" ''
139 echo 60 > /sys/devices/system/cpu/intel_pstate/max_perf_pct 139 echo 50 > /sys/devices/system/cpu/intel_pstate/max_perf_pct
140 ''; 140 '';
141 RemainAfterExit = true; 141 RemainAfterExit = true;
142 ExecStop = pkgs.writeShellScript "limit-pstate-stop" '' 142 ExecStop = pkgs.writeShellScript "limit-pstate-stop" ''
diff --git a/modules/uucp.nix b/modules/uucp.nix
index abca2acb..10f7297b 100644
--- a/modules/uucp.nix
+++ b/modules/uucp.nix
@@ -314,32 +314,7 @@ in {
314 in listToAttrs (map wrapper ["uucico" "cu" "uucp" "uuname" "uustat" "uux" "uuxqt"]); 314 in listToAttrs (map wrapper ["uucico" "cu" "uucp" "uuname" "uustat" "uux" "uuxqt"]);
315 315
316 nixpkgs.overlays = [(self: super: { 316 nixpkgs.overlays = [(self: super: {
317 uucp = super.lib.overrideDerivation super.uucp (oldAttrs: { 317 rmail = super.writeShellScriptBin "rmail" ''
318 configureFlags = "--with-newconfigdir=/etc/uucp";
319 patches = [
320 (super.writeText "mailprogram" ''
321 policy.h | 2 +-
322 1 file changed, 1 insertion(+), 1 deletion(-)
323
324 diff --git a/policy.h b/policy.h
325 index 5afe34b..8e92c8b 100644
326 --- a/policy.h
327 +++ b/policy.h
328 @@ -240,7 +240,7 @@
329 the sendmail choice below. Otherwise, select one of the other
330 choices as appropriate. */
331 #if 1
332 -#define MAIL_PROGRAM "/usr/lib/sendmail -t"
333 +#define MAIL_PROGRAM "${config.security.wrapperDir}/sendmail -t"
334 /* #define MAIL_PROGRAM "/usr/sbin/sendmail -t" */
335 #define MAIL_PROGRAM_TO_BODY 1
336 #define MAIL_PROGRAM_SUBJECT_BODY 1
337 '')
338 ];
339 });
340 rmail = super.writeScriptBin "rmail" ''
341 #!${super.stdenv.shell}
342
343 # Dummy UUCP rmail command for postfix/qmail systems 318 # Dummy UUCP rmail command for postfix/qmail systems
344 319
345 IFS=" " read junk from junk junk junk junk junk junk junk relay 320 IFS=" " read junk from junk junk junk junk junk junk junk relay
diff --git a/overlays/uucp/default.nix b/overlays/uucp/default.nix
new file mode 100644
index 00000000..4189dbcc
--- /dev/null
+++ b/overlays/uucp/default.nix
@@ -0,0 +1,9 @@
1{ final, prev, ... }: {
2 uucp = prev.uucp.overrideAttrs (oldAttrs: {
3 configureFlags = (oldAttrs.configureFlags or []) ++ ["--with-newconfigdir=/etc/uucp"];
4 patches = (oldAttrs.patches or []) ++ [
5 ./mailprogram.patch
6 ];
7 NIX_CFLAGS_COMPILE = "${oldAttrs.NIX_CFLAGS_COMPILE or ""} -Wno-error=incompatible-pointer-types";
8 });
9}
diff --git a/overlays/uucp/mailprogram.patch b/overlays/uucp/mailprogram.patch
new file mode 100644
index 00000000..89ac8f31
--- /dev/null
+++ b/overlays/uucp/mailprogram.patch
@@ -0,0 +1,16 @@
1 policy.h | 2 +-
2 1 file changed, 1 insertion(+), 1 deletion(-)
3
4diff --git a/policy.h b/policy.h
5index 5afe34b..8e92c8b 100644
6--- a/policy.h
7+++ b/policy.h
8@@ -240,7 +240,7 @@
9 the sendmail choice below. Otherwise, select one of the other
10 choices as appropriate. */
11 #if 1
12-#define MAIL_PROGRAM "/usr/lib/sendmail -t"
13+#define MAIL_PROGRAM "${config.security.wrapperDir}/sendmail -t"
14 /* #define MAIL_PROGRAM "/usr/sbin/sendmail -t" */
15 #define MAIL_PROGRAM_TO_BODY 1
16 #define MAIL_PROGRAM_SUBJECT_BODY 1
diff --git a/overlays/wttrbar/default.nix b/overlays/wttrbar/default.nix
deleted file mode 100644
index 876fa699..00000000
--- a/overlays/wttrbar/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
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
deleted file mode 100644
index e7e721c8..00000000
--- a/overlays/wttrbar/icons.patch
+++ /dev/null
@@ -1,154 +0,0 @@
1diff --git a/src/constants.rs b/src/constants.rs
2index 81b1926..3619d8f 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, "<span font=\"Symbols Nerd Font Mono\"></span>"),
68+ (116, "<span font=\"Symbols Nerd Font Mono\"></span>"),
69+ (119, "<span font=\"Symbols Nerd Font Mono\">îŒŊ</span>"),
70+ (122, "<span font=\"Symbols Nerd Font Mono\"></span>"),
71+ (143, "<span font=\"Symbols Nerd Font Mono\"></span>"),
72+ (176, "<span font=\"Symbols Nerd Font Mono\"></span>"),
73+ (179, "<span font=\"Symbols Nerd Font Mono\"></span>"),
74+ (182, "<span font=\"Symbols Nerd Font Mono\">îŽĒ</span>"),
75+ (185, "<span font=\"Symbols Nerd Font Mono\">îŽĒ</span>"),
76+ (200, "<span font=\"Symbols Nerd Font Mono\"></span>"),
77+ (227, "<span font=\"Symbols Nerd Font Mono\"></span>"),
78+ (230, "<span font=\"Symbols Nerd Font Mono\"></span>"),
79+ (248, "<span font=\"Symbols Nerd Font Mono\"></span>"),
80+ (260, "<span font=\"Symbols Nerd Font Mono\"></span>"),
81+ (263, "<span font=\"Symbols Nerd Font Mono\"></span>"),
82+ (266, "<span font=\"Symbols Nerd Font Mono\"></span>"),
83+ (281, "<span font=\"Symbols Nerd Font Mono\">îŽĒ</span>"),
84+ (284, "<span font=\"Symbols Nerd Font Mono\">îŽĒ</span>"),
85+ (293, "<span font=\"Symbols Nerd Font Mono\"></span>"),
86+ (296, "<span font=\"Symbols Nerd Font Mono\"></span>"),
87+ (299, "<span font=\"Symbols Nerd Font Mono\"></span>"),
88+ (302, "<span font=\"Symbols Nerd Font Mono\"></span>"),
89+ (305, "<span font=\"Symbols Nerd Font Mono\"></span>"),
90+ (308, "<span font=\"Symbols Nerd Font Mono\"></span>"),
91+ (311, "<span font=\"Symbols Nerd Font Mono\">îŽĒ</span>"),
92+ (314, "<span font=\"Symbols Nerd Font Mono\">îŽĒ</span>"),
93+ (317, "<span font=\"Symbols Nerd Font Mono\">îŽĒ</span>"),
94+ (320, "<span font=\"Symbols Nerd Font Mono\"></span>"),
95+ (323, "<span font=\"Symbols Nerd Font Mono\"></span>"),
96+ (326, "<span font=\"Symbols Nerd Font Mono\"></span>"),
97+ (329, "<span font=\"Symbols Nerd Font Mono\"></span>"),
98+ (332, "<span font=\"Symbols Nerd Font Mono\"></span>"),
99+ (335, "<span font=\"Symbols Nerd Font Mono\"></span>"),
100+ (338, "<span font=\"Symbols Nerd Font Mono\"></span>"),
101+ (350, "<span font=\"Symbols Nerd Font Mono\">îŽĒ</span>"),
102+ (353, "<span font=\"Symbols Nerd Font Mono\"></span>"),
103+ (356, "<span font=\"Symbols Nerd Font Mono\"></span>"),
104+ (359, "<span font=\"Symbols Nerd Font Mono\"></span>"),
105+ (362, "<span font=\"Symbols Nerd Font Mono\"></span>"),
106+ (365, "<span font=\"Symbols Nerd Font Mono\"></span>"),
107+ (368, "<span font=\"Symbols Nerd Font Mono\"></span>"),
108+ (371, "<span font=\"Symbols Nerd Font Mono\"></span>"),
109+ (374, "<span font=\"Symbols Nerd Font Mono\"></span>"),
110+ (377, "<span font=\"Symbols Nerd Font Mono\">îŽĒ</span>"),
111+ (386, "<span font=\"Symbols Nerd Font Mono\"></span>"),
112+ (389, "<span font=\"Symbols Nerd Font Mono\"></span>"),
113+ (392, "<span font=\"Symbols Nerd Font Mono\">îĨ</span>"),
114+ (395, "<span font=\"Symbols Nerd Font Mono\"></span>"),
115 ];
116
117 pub const ICON_PLACEHOLDER: &str = "{ICON}";
118diff --git a/src/main.rs b/src/main.rs
119index 6ac4654..1b84207 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+ "<span font=\"Symbols Nerd Font Mono\">ķ°¸ƒ</span> {}° <span font=\"Symbols Nerd Font Mono\">ķ°¸‚</span> {}° ",
128 day["maxtempF"].as_str().unwrap(),
129 day["mintempF"].as_str().unwrap(),
130 );
131 } else {
132 tooltip += &format!(
133- "âŦ†ī¸ {}° âŦ‡ī¸ {}° ",
134+ "<span font=\"Symbols Nerd Font Mono\">ķ°¸ƒ</span> {}° <span font=\"Symbols Nerd Font Mono\">ķ°¸‚</span> {}° ",
135 day["maxtempC"].as_str().unwrap(),
136 day["mintempC"].as_str().unwrap(),
137 );
138 };
139
140 tooltip += &format!(
141- "🌅 {} 🌇 {}\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),
144 format_ampm_time(day, "sunset", args.ampm),
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()
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-08 20:24:19 +0000