...

4 files changed, 25 insertions, 161 deletions

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 @@
+{ final, prev, ... }: {
+  uucp = prev.uucp.overrideAttrs (oldAttrs: {
+    configureFlags = (oldAttrs.configureFlags or []) ++ ["--with-newconfigdir=/etc/uucp"];
+    patches = (oldAttrs.patches or []) ++ [
+      ./mailprogram.patch
+    ];
+    NIX_CFLAGS_COMPILE = "${oldAttrs.NIX_CFLAGS_COMPILE or ""} -Wno-error=incompatible-pointer-types";
+  });
+}
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 @@
+ policy.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/policy.h b/policy.h
+index 5afe34b..8e92c8b 100644
+--- a/policy.h
++++ b/policy.h
+@@ -240,7 +240,7 @@
+    the sendmail choice below.  Otherwise, select one of the other
+    choices as appropriate.  */
+ #if 1
+-#define MAIL_PROGRAM "/usr/lib/sendmail -t"
++#define MAIL_PROGRAM "${config.security.wrapperDir}/sendmail -t"
+ /* #define MAIL_PROGRAM "/usr/sbin/sendmail -t" */
+ #define MAIL_PROGRAM_TO_BODY 1
+ #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 @@
-{ prev, ... }: {
-  wttrbar = prev.wttrbar.overrideAttrs (oldAttrs: {
-    patches = (oldAttrs.patches or []) ++ [
-      ./icons.patch
-    ];
-  });
-}
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 @@
-diff --git a/src/constants.rs b/src/constants.rs
-index 81b1926..3619d8f 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, "<span font=\"Symbols Nerd Font Mono\"></span>"),
-+    (116, "<span font=\"Symbols Nerd Font Mono\"></span>"),
-+    (119, "<span font=\"Symbols Nerd Font Mono\"></span>"),
-+    (122, "<span font=\"Symbols Nerd Font Mono\"></span>"),
-+    (143, "<span font=\"Symbols Nerd Font Mono\"></span>"),
-+    (176, "<span font=\"Symbols Nerd Font Mono\"></span>"),
-+    (179, "<span font=\"Symbols Nerd Font Mono\"></span>"),
-+    (182, "<span font=\"Symbols Nerd Font Mono\"></span>"),
-+    (185, "<span font=\"Symbols Nerd Font Mono\"></span>"),
-+    (200, "<span font=\"Symbols Nerd Font Mono\"></span>"),
-+    (227, "<span font=\"Symbols Nerd Font Mono\"></span>"),
-+    (230, "<span font=\"Symbols Nerd Font Mono\"></span>"),
-+    (248, "<span font=\"Symbols Nerd Font Mono\"></span>"),
-+    (260, "<span font=\"Symbols Nerd Font Mono\"></span>"),
-+    (263, "<span font=\"Symbols Nerd Font Mono\"></span>"),
-+    (266, "<span font=\"Symbols Nerd Font Mono\"></span>"),
-+    (281, "<span font=\"Symbols Nerd Font Mono\"></span>"),
-+    (284, "<span font=\"Symbols Nerd Font Mono\"></span>"),
-+    (293, "<span font=\"Symbols Nerd Font Mono\"></span>"),
-+    (296, "<span font=\"Symbols Nerd Font Mono\"></span>"),
-+    (299, "<span font=\"Symbols Nerd Font Mono\"></span>"),
-+    (302, "<span font=\"Symbols Nerd Font Mono\"></span>"),
-+    (305, "<span font=\"Symbols Nerd Font Mono\"></span>"),
-+    (308, "<span font=\"Symbols Nerd Font Mono\"></span>"),
-+    (311, "<span font=\"Symbols Nerd Font Mono\"></span>"),
-+    (314, "<span font=\"Symbols Nerd Font Mono\"></span>"),
-+    (317, "<span font=\"Symbols Nerd Font Mono\"></span>"),
-+    (320, "<span font=\"Symbols Nerd Font Mono\"></span>"),
-+    (323, "<span font=\"Symbols Nerd Font Mono\"></span>"),
-+    (326, "<span font=\"Symbols Nerd Font Mono\"></span>"),
-+    (329, "<span font=\"Symbols Nerd Font Mono\"></span>"),
-+    (332, "<span font=\"Symbols Nerd Font Mono\"></span>"),
-+    (335, "<span font=\"Symbols Nerd Font Mono\"></span>"),
-+    (338, "<span font=\"Symbols Nerd Font Mono\"></span>"),
-+    (350, "<span font=\"Symbols Nerd Font Mono\"></span>"),
-+    (353, "<span font=\"Symbols Nerd Font Mono\"></span>"),
-+    (356, "<span font=\"Symbols Nerd Font Mono\"></span>"),
-+    (359, "<span font=\"Symbols Nerd Font Mono\"></span>"),
-+    (362, "<span font=\"Symbols Nerd Font Mono\"></span>"),
-+    (365, "<span font=\"Symbols Nerd Font Mono\"></span>"),
-+    (368, "<span font=\"Symbols Nerd Font Mono\"></span>"),
-+    (371, "<span font=\"Symbols Nerd Font Mono\"></span>"),
-+    (374, "<span font=\"Symbols Nerd Font Mono\"></span>"),
-+    (377, "<span font=\"Symbols Nerd Font Mono\"></span>"),
-+    (386, "<span font=\"Symbols Nerd Font Mono\"></span>"),
-+    (389, "<span font=\"Symbols Nerd Font Mono\"></span>"),
-+    (392, "<span font=\"Symbols Nerd Font Mono\"></span>"),
-+    (395, "<span font=\"Symbols Nerd Font Mono\"></span>"),
- ];
- 
- pub const ICON_PLACEHOLDER: &str = "{ICON}";
-diff --git a/src/main.rs b/src/main.rs
-index 6ac4654..1b84207 100644
---- a/src/main.rs
-+++ b/src/main.rs
-@@ -175,20 +175,20 @@ fn main() {
- 
-         if args.fahrenheit {
-             tooltip += &format!(
--                "⬆️ {}° ⬇️ {}° ",
-+                "<span font=\"Symbols Nerd Font Mono\">󰸃</span> {}° <span font=\"Symbols Nerd Font Mono\">󰸂</span> {}° ",
-                 day["maxtempF"].as_str().unwrap(),
-                 day["mintempF"].as_str().unwrap(),
-             );
-         } else {
-             tooltip += &format!(
--                "⬆️ {}° ⬇️ {}° ",
-+                "<span font=\"Symbols Nerd Font Mono\">󰸃</span> {}° <span font=\"Symbols Nerd Font Mono\">󰸂</span> {}° ",
-                 day["maxtempC"].as_str().unwrap(),
-                 day["mintempC"].as_str().unwrap(),
-             );
-         };
- 
-         tooltip += &format!(
--            "🌅 {} 🌇 {}\n",
-+            "<span font=\"Symbols Nerd Font Mono\"></span> {} <span font=\"Symbols Nerd Font Mono\"></span> {}\n",
-             format_ampm_time(day, "sunrise", args.ampm),
-             format_ampm_time(day, "sunset", args.ampm),
-         );
-@@ -207,7 +207,7 @@ fn main() {
-             }
- 
-             let mut tooltip_line = format!(
--                "{} {} {} {}",
-+                "{} {}{} {}",
-                 format_time(hour["time"].as_str().unwrap(), args.ampm),
-                 WEATHER_CODES
-                     .iter()