diff --git a/nixos/polybar.nix b/nixos/polybar.nix
index 94d2c8de..663964b3 100644
--- a/nixos/polybar.nix
+++ b/nixos/polybar.nix
@@ -14,6 +14,7 @@
       "settings" = {screenchange-reload = "true";};
       "bar/main_bar" = {
         font-0 = "DejaVu Sans Mono for Powerline:size=12.0;weight=bold";
+        font-1 = "Weather Icons:size=12;0";
         background = "#002b36";
         foreground = "#839496";
         bottom = "false";
@@ -24,7 +25,7 @@
         module-margin-left = 1;
         module-margin-right = 1;
         modules-left = "i3";
-        modules-center = "date";
+        modules-center = "date weather";
         modules-right = "memory swap cpu temperature battery1 battery0";
         tray-position = "right";
       };
@@ -37,6 +38,13 @@
         label = "%date% %time%";
       };
 
+      "module/weather" = {
+        type = "custom/script";
+        interval = 600;
+        exec = "~/dev/dotfiles/openweathermap-fullfeatured.sh";
+        label-font = 2;
+      };
+
       "module/i3" = {
         type = "internal/i3";
       };
diff --git a/openweathermap-fullfeatured.sh b/openweathermap-fullfeatured.sh
new file mode 100755
index 00000000..80d5f1b1
--- /dev/null
+++ b/openweathermap-fullfeatured.sh
@@ -0,0 +1,104 @@
+#!/bin/sh
+
+source $HOME/.open-secrets.sh
+
+KEY="$OPENWEATHERMAP_KEY"
+CITY=""
+UNITS="metric"
+SYMBOL="°"
+
+API="https://api.openweathermap.org/data/2.5"
+
+CURL="/run/current-system/sw/bin/curl -sf"
+CUT="/run/current-system/sw/bin/cut"
+DATE="/run/current-system/sw/bin/date"
+JQ="$HOME/.nix-profile/bin/jq"
+UNAME="/run/current-system/sw/bin/uname"
+
+get_icon() {
+    case $1 in
+        01d) icon="";;
+        01n) icon="";;
+        02d) icon="";;
+        02n) icon="";;
+        03*) icon="";;
+        04*) icon="";;
+        09d) icon="";;
+        09n) icon="";;
+        10d) icon="";;
+        10n) icon="";;
+        11d) icon="";;
+        11n) icon="";;
+        13d) icon="";;
+        13n) icon="";;
+        50d) icon="";;
+        50n) icon="";;
+        *) icon="";
+    esac
+
+    echo $icon
+}
+
+get_duration() {
+
+    osname=$($UNAME -s)
+
+    case $osname in
+        *BSD) $DATE -r "$1" -u +%H:%M;;
+        *) $DATE --date="@$1" -u +%H:%M;;
+    esac
+
+}
+
+if [ -n "$CITY" ]; then
+    if [ "$CITY" -eq "$CITY" ] 2>/dev/null; then
+        CITY_PARAM="id=$CITY"
+    else
+        CITY_PARAM="q=$CITY"
+    fi
+
+    current=$($CURL "$API/weather?appid=$KEY&$CITY_PARAM&units=$UNITS")
+    forecast=$($CURL "$API/forecast?appid=$KEY&$CITY_PARAM&units=$UNITS&cnt=1")
+else
+    location=$($CURL https://location.services.mozilla.com/v1/geolocate?key=geoclue)
+
+    if [ -n "$location" ]; then
+        location_lat="$(echo "$location" | $JQ '.location.lat')"
+        location_lon="$(echo "$location" | $JQ '.location.lng')"
+
+        current=$($CURL "$API/weather?appid=$KEY&lat=$location_lat&lon=$location_lon&units=$UNITS")
+        forecast=$($CURL "$API/forecast?appid=$KEY&lat=$location_lat&lon=$location_lon&units=$UNITS&cnt=1")
+    fi
+fi
+
+if [ -n "$current" ] && [ -n "$forecast" ]; then
+    current_temp=$(echo "$current" | $JQ ".main.temp" | $CUT -d "." -f 1)
+    current_icon=$(echo "$current" | $JQ -r ".weather[0].icon")
+
+    forecast_temp=$(echo "$forecast" | $JQ ".list[].main.temp" | $CUT -d "." -f 1)
+    forecast_icon=$(echo "$forecast" | $JQ -r ".list[].weather[0].icon")
+
+
+    if [ "$current_temp" -gt "$forecast_temp" ]; then
+        trend=""
+    elif [ "$forecast_temp" -gt "$current_temp" ]; then
+        trend=""
+    else
+        trend=""
+    fi
+
+
+    sun_rise=$(echo "$current" | $JQ ".sys.sunrise")
+    sun_set=$(echo "$current" | $JQ ".sys.sunset")
+    now=$($DATE +%s)
+
+    if [ "$sun_rise" -gt "$now" ]; then
+        daytime=" $(get_duration "$((sun_rise-now))")"
+    elif [ "$sun_set" -gt "$now" ]; then
+        daytime=" $(get_duration "$((sun_set-now))")"
+    else
+        daytime=" $(get_duration "$((sun_rise-now))")"
+    fi
+
+    echo "$(get_icon "$current_icon") $current_temp$SYMBOL  $trend  $(get_icon "$forecast_icon") $forecast_temp$SYMBOL   $daytime"
+fi