4 files changed, 14 insertions, 6 deletions

diff --git a/home-config/home-configuration.scm b/home-config/home-configuration.scm
index c1ff5d6..9b64dec 100644
--- a/home-config/home-configuration.scm
+++ b/home-config/home-configuration.scm
@@ -54,13 +54,12 @@
                                                     "netcat"
                                                     "bind:utils"
                                                     "font-cns11643"
+                                                    "font-google-noto-emoji"
                                                     "syncthing"
                                                     "imv"
                                                     "perl"
                                                     "tor"
                                                     "unzip"
-                                                    "alacritty"
-                                                    "foot"
                                                     "htop"
                                                     "curl"
                                                     "pandoc"
diff --git a/home-config/nix-home-manager/home.nix b/home-config/nix-home-manager/home.nix
index 292f8ba..8165434 100644
--- a/home-config/nix-home-manager/home.nix
+++ b/home-config/nix-home-manager/home.nix
@@ -32,6 +32,7 @@
     rustup
     gcc
     pkg-config
+    wttrbar
 
     # # It is sometimes useful to fine-tune packages, for example, by applying
     # # overrides. You can do that directly here, just don't forget the
diff --git a/home-config/waybar/config b/home-config/waybar/config
index 3dff06a..df9f6bb 100644
--- a/home-config/waybar/config
+++ b/home-config/waybar/config
@@ -56,7 +56,7 @@
             "ethernet": [""],
             "disconnected": ["󰤭"]
         },
-        "on-click": "alacritty -e doas nmtui",
+        "on-click": "foot -t alacritty doas nmtui",
         "tooltip": false
     },
     "pulseaudio": {
@@ -96,16 +96,24 @@
         "on-scroll-down": "light -A 1",
         "on-scroll-up": "light -U 1"
     },
-    "custom/weather": {
+    "custom/weather_OLD": {
         "format-alt": "{}",
         "format": "{alt}: {}",
         "format-alt-click": "click-right",
         "interval": 1800,
         "return-type": "json",
-        "on-click": "alacritty --class ala-wttr --hold -e curl https://v2.wttr.in",
+        "on-click": "foot -a ala-wttr -H curl https://v2.wttr.in",
         "exec": "~/.config/waybar/modules/weather.sh",
         "exec-if": "ping wttr.in -c1"
     },
+    "custom/weather": {
+        "format": "{} °",
+        "tooltip": true,
+        "interval": 3600,
+        "exec": "exit=101; while [ $exit = 101 ]; do wttrbar --main-indicator temp_F --fahrenheit; exit=$(echo $?); sleep 1; done",
+        "on-click": "foot -a ala-wttr -H curl https://v2.wttr.in",
+        "return-type": "json"
+    },
     "idle_inhibitor": {
         "format": "{icon}",
         "format-icons": {
diff --git a/modules/ryan-config/base-system.scm b/modules/ryan-config/base-system.scm
index d2af9e8..ae5c1af 100644
--- a/modules/ryan-config/base-system.scm
+++ b/modules/ryan-config/base-system.scm
@@ -113,7 +113,7 @@
                                                                     "swayidle"
                                                                     ;"swaylock-effects"
                                                                     "fuzzel"
-                                                                    "alacritty"
+                                                        "foot"
                                                           "pinentry-qt"
                                                           "adwaita-icon-theme"
                                                           "hicolor-icon-theme"