update

2026-04-17 19:38:35 +02:00
parent 556c0823c2
commit 8e6f0db4ba
9 changed files with 962 additions and 65 deletions
--- a/.config/waybar/config.jsonc
+++ b/.config/waybar/config.jsonc
@@ -10,6 +10,8 @@
        "clock"
    ],
    "modules-right": [
+        "custom/spotify",
+        "custom/weather",
        "custom/screenshot",
        "idle_inhibitor",
        "pulseaudio",
@@ -23,28 +25,50 @@
        "format": "{id}"
    },
    "custom/screenshot": {
-        "exec": "printf '{\"text\": \"󰄀\", \"tooltip\": \"Area screenshot: edit in Swappy, copy to clipboard, save to NAS pictures if mounted\"}'",
+        "exec": "printf '{\"text\": \"<span foreground=\\\"#D8DEE9\\\">Shot</span> <span font_desc=\\\"SauceCodePro Nerd Font 15\\\" foreground=\\\"#88C0D0\\\">󰄀</span>\", \"tooltip\": \"Area screenshot: edit in Swappy, then choose save path and filename; Esc on filename uses screenshot\"}'",
        "return-type": "json",
+        "escape": false,
        "interval": "once",
        "on-click": "$HOME/.config/waybar/scripts/capture-share-shot.sh"
    },
    "idle_inhibitor": {
+        "escape": false,
        "format": "{icon}",
        "format-icons": {
-            "activated": "",
-            "deactivated": ""
+            "activated": "<span foreground=\"#A3BE8C\">Awake</span> <span font_desc=\"SauceCodePro Nerd Font 15\" foreground=\"#A3BE8C\"></span>",
+            "deactivated": "<span foreground=\"#D8DEE9\">Idle</span> <span font_desc=\"SauceCodePro Nerd Font 15\" foreground=\"#81A1C1\"></span>"
        }
    },
    "tray": {
        "spacing": 10
    },
    "clock": {
-        "format": " {:%H:%M}",
+        "escape": false,
+        "format": "<span foreground=\"#D8DEE9\">{:%H:%M}</span> <span font_desc=\"SauceCodePro Nerd Font 15\" foreground=\"#88C0D0\"></span>",
        "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
-        "format-alt": " {:%Y-%m-%d}"
+        "format-alt": "<span foreground=\"#D8DEE9\">{:%Y-%m-%d}</span> <span font_desc=\"SauceCodePro Nerd Font 15\" foreground=\"#81A1C1\"></span>"
+    },
+    "custom/spotify": {
+        "exec": "bash $HOME/.config/waybar/scripts/spotify-waybar.sh",
+        "return-type": "json",
+        "interval": 2,
+        "escape": false,
+        "on-click": "bash $HOME/.config/waybar/scripts/spotify-waybar.sh --toggle",
+        "on-click-right": "bash $HOME/.config/waybar/scripts/spotify-waybar.sh --stop",
+        "on-scroll-up": "bash $HOME/.config/waybar/scripts/spotify-waybar.sh --next",
+        "on-scroll-down": "bash $HOME/.config/waybar/scripts/spotify-waybar.sh --prev",
+        "tooltip": false
+    },
+    "custom/weather": {
+        "exec": "bash $HOME/.config/waybar/scripts/weather-norrkoping.sh",
+        "return-type": "json",
+        "interval": 600,
+        "escape": false,
+        "tooltip": true
    },
    "cpu": {
-        "format": " {usage}%",
+        "escape": false,
+        "format": "<span foreground=\"#D8DEE9\">{usage}%</span> <span font_desc=\"SauceCodePro Nerd Font 15\" foreground=\"#81A1C1\"></span>",
        "tooltip": false,
        "on-click": "alacritty -e btop"
    },
@@ -52,6 +76,7 @@
    "custom/mount-data": {
        "exec": "$HOME/.config/waybar/scripts/check-mount.sh /mnt/data data",
        "return-type": "json",
+        "escape": false,
        "interval": 10,
        "tooltip": true,
        "on-click": "thunar /mnt/data"
@@ -59,34 +84,37 @@
    "custom/mount-usb1": {
        "exec": "$HOME/.config/waybar/scripts/check-mount.sh /mnt/usb1 usb1",
        "return-type": "json",
+        "escape": false,
        "interval": 10,
        "tooltip": true,
        "on-click": "thunar /mnt/usb1"
    },
    "network": {
-        "format-wifi": " {essid} ({signalStrength}%)",
-        "format-ethernet": "󰈀 {ipaddr}/{cidr}",
-        "tooltip-format": "󰈀 {ifname} via {gwaddr}",
-        "format-linked": "󰈀 {ifname} (No IP)",
-        "format-disconnected": "󰖪 Disconnected",
-        "format-alt": "󰈀 {ifname}: {ipaddr}/{cidr}",
+        "escape": false,
+        "format-wifi": "<span foreground=\"#D8DEE9\">{essid} ({signalStrength}%)</span> <span font_desc=\"SauceCodePro Nerd Font 15\" foreground=\"#88C0D0\"></span>",
+        "format-ethernet": "<span foreground=\"#D8DEE9\">{ipaddr}/{cidr}</span> <span font_desc=\"SauceCodePro Nerd Font 15\" foreground=\"#88C0D0\">󰈀</span>",
+        "tooltip-format": "<span foreground=\"#D8DEE9\">{ifname} via {gwaddr}</span> <span font_desc=\"SauceCodePro Nerd Font 15\" foreground=\"#88C0D0\">󰈀</span>",
+        "format-linked": "<span foreground=\"#D8DEE9\">{ifname} (No IP)</span> <span font_desc=\"SauceCodePro Nerd Font 15\" foreground=\"#81A1C1\">󰈀</span>",
+        "format-disconnected": "<span foreground=\"#EBCB8B\">Disconnected</span> <span font_desc=\"SauceCodePro Nerd Font 15\" foreground=\"#BF616A\">󰖪</span>",
+        "format-alt": "<span foreground=\"#D8DEE9\">{ifname}: {ipaddr}/{cidr}</span> <span font_desc=\"SauceCodePro Nerd Font 15\" foreground=\"#88C0D0\">󰈀</span>",
        "on-click-right": "nm-connection-editor"
    },
    "pulseaudio": {
-        "format": "{icon} {volume}% {format_source}",
-        "format-bluetooth": "{icon} {volume}%  {format_source}",
-        "format-bluetooth-muted": " {icon}  {format_source}",
-        "format-muted": " {format_source}",
-        "format-source": " {volume}%",
-        "format-source-muted": "",
+        "escape": false,
+        "format": "<span foreground=\"#D8DEE9\">{volume}%</span> {format_source} {icon}",
+        "format-bluetooth": "<span foreground=\"#D8DEE9\">{volume}%</span> <span font_desc=\"SauceCodePro Nerd Font 15\" foreground=\"#81A1C1\"></span> {format_source} {icon}",
+        "format-bluetooth-muted": "{format_source} <span font_desc=\"SauceCodePro Nerd Font 15\" foreground=\"#81A1C1\"></span> {icon} <span font_desc=\"SauceCodePro Nerd Font 15\" foreground=\"#D08770\"></span>",
+        "format-muted": "{format_source} <span font_desc=\"SauceCodePro Nerd Font 15\" foreground=\"#D08770\"></span>",
+        "format-source": "<span foreground=\"#D8DEE9\">{volume}%</span> <span font_desc=\"SauceCodePro Nerd Font 15\" foreground=\"#B48EAD\"></span>",
+        "format-source-muted": "<span font_desc=\"SauceCodePro Nerd Font 15\" foreground=\"#D08770\"></span>",
        "format-icons": {
-            "headphone": "",
-            "hands-free": "",
-            "headset": "",
-            "phone": "",
-            "portable": "",
-            "car": "",
-            "default": ["", "", ""]
+            "headphone": "<span font_desc=\"SauceCodePro Nerd Font 15\" foreground=\"#B48EAD\"></span>",
+            "hands-free": "<span font_desc=\"SauceCodePro Nerd Font 15\" foreground=\"#B48EAD\"></span>",
+            "headset": "<span font_desc=\"SauceCodePro Nerd Font 15\" foreground=\"#B48EAD\"></span>",
+            "phone": "<span font_desc=\"SauceCodePro Nerd Font 15\" foreground=\"#B48EAD\"></span>",
+            "portable": "<span font_desc=\"SauceCodePro Nerd Font 15\" foreground=\"#B48EAD\"></span>",
+            "car": "<span font_desc=\"SauceCodePro Nerd Font 15\" foreground=\"#B48EAD\"></span>",
+            "default": ["<span font_desc=\"SauceCodePro Nerd Font 15\" foreground=\"#B48EAD\"></span>", "<span font_desc=\"SauceCodePro Nerd Font 15\" foreground=\"#B48EAD\"></span>", "<span font_desc=\"SauceCodePro Nerd Font 15\" foreground=\"#B48EAD\"></span>"]
        },
        "on-click": "pavucontrol"
    }
--- a/.config/waybar/scripts/capture-share-shot.sh
+++ b/.config/waybar/scripts/capture-share-shot.sh
@@ -11,7 +11,14 @@ cleanup() {
 }
 trap cleanup EXIT

-choose_subfolder() {
+trim_whitespace() {
+    local value="$1"
+    value="${value#"${value%%[![:space:]]*}"}"
+    value="${value%"${value##*[![:space:]]}"}"
+    printf '%s\n' "$value"
+}
+
+choose_destination_dir() {
    if [[ ! -d "$base_dir" ]] || ! mountpoint -q /mnt/data; then
        return 1
    fi
@@ -21,7 +28,7 @@ choose_subfolder() {
        find "$base_dir" -mindepth 1 -type d -printf '%P\n' | sort
    } > "$selection_file"

-    if selected=$(wofi --dmenu --prompt 'Save screenshot folder' < "$selection_file"); then
+    if selected=$(wofi --dmenu --prompt 'Save screenshot path' < "$selection_file"); then
        if [[ -z "$selected" || "$selected" == "/" ]]; then
            printf '%s\n' "$base_dir"
        else
@@ -33,6 +40,47 @@ choose_subfolder() {
    printf '%s\n' "$base_dir"
 }

+choose_filename() {
+    local default_name="screenshot"
+    local selected=""
+
+    if selected=$(printf '%s\n' "$default_name" | wofi --dmenu --prompt 'Save screenshot filename'); then
+        selected=$(trim_whitespace "$selected")
+    else
+        selected="$default_name"
+    fi
+
+    if [[ -z "$selected" ]]; then
+        selected="$default_name"
+    fi
+
+    selected="${selected%.png}"
+
+    if [[ -z "$selected" ]]; then
+        selected="$default_name"
+    fi
+
+    printf '%s\n' "$selected"
+}
+
+build_unique_path() {
+    local destination_dir="$1"
+    local file_stem="$2"
+    local candidate="$destination_dir/$file_stem.png"
+    local counter=1
+
+    if [[ ! -e "$candidate" ]]; then
+        printf '%s\n' "$candidate"
+        return
+    fi
+
+    while [[ -e "$destination_dir/$file_stem-$counter.png" ]]; do
+        counter=$((counter + 1))
+    done
+
+    printf '%s\n' "$destination_dir/$file_stem-$counter.png"
+}
+
 if ! region="$(slurp)"; then
    exit 0
 fi
@@ -43,11 +91,13 @@ fi

 wl-copy --type image/png < "$tmp_file"

-if destination_dir="$(choose_subfolder)"; then
+if destination_dir="$(choose_destination_dir)"; then
    mkdir -p "$destination_dir"
-    file_name="screenshot-$(date +%Y%m%d-%H%M%S).png"
-    cp "$tmp_file" "$destination_dir/$file_name"
-    notify-send 'Screenshot saved' "$destination_dir/$file_name\nCopied to clipboard"
+    file_stem="$(choose_filename)"
+    destination_path="$(build_unique_path "$destination_dir" "$file_stem")"
+    cp "$tmp_file" "$destination_path"
+    notify-send 'Screenshot saved' "$destination_path
+Copied to clipboard"
 else
    notify-send 'Screenshot copied' 'NAS picture share is not available; image copied to clipboard only'
 fi
--- a/.config/waybar/scripts/check-mount.sh
+++ b/.config/waybar/scripts/check-mount.sh
@@ -7,10 +7,37 @@ LABEL="$2"
 ICON_MOUNT="󰋊"
 ICON_DOWN=""

+json_escape() {
+    local s="$1"
+    s=${s//\\/\\\\}
+    s=${s//\"/\\\"}
+    s=${s//$'\n'/\\n}
+    printf '%s' "$s"
+}
+
+markup_escape() {
+    local s="$1"
+    s=${s//&/&amp;}
+    s=${s//</&lt;}
+    s=${s//>/&gt;}
+    printf '%s' "$s"
+}
+
+icon_markup() {
+    local icon="$1"
+    local color="$2"
+    printf '<span font_desc="SauceCodePro Nerd Font 15" foreground="%s">%s</span>' "$color" "$icon"
+}
+
 if mountpoint -q "$MOUNT"; then
    read -r used avail pcent <<< "$(df -h --output=used,avail,pcent "$MOUNT" | tail -1)"
-    printf '{"text": "%s %s %s/%s (%s)", "tooltip": "%s mounted — used: %s, free: %s (%s)", "class": "mounted"}\n' \
-        "$ICON_MOUNT" "$LABEL" "$used" "$avail" "$pcent" "$MOUNT" "$used" "$avail" "$pcent"
+    text="<span foreground=\"#D8DEE9\">$(markup_escape "$LABEL $used/$avail ($pcent)")</span> $(icon_markup "$ICON_MOUNT" "#A3BE8C")"
+    tooltip="$(markup_escape "$MOUNT mounted - used: $used, free: $avail ($pcent)")"
+    printf '{"text":"%s","tooltip":"%s","class":"mounted"}\n' \
+        "$(json_escape "$text")" "$(json_escape "$tooltip")"
 else
-    printf '{"text": "%s %s N/A", "tooltip": "%s is NOT mounted", "class": "unmounted"}\n' "$ICON_DOWN" "$LABEL" "$MOUNT"
+    text="<span foreground=\"#EBCB8B\">$(markup_escape "$LABEL N/A")</span> $(icon_markup "$ICON_DOWN" "#BF616A")"
+    tooltip="$(markup_escape "$MOUNT is NOT mounted")"
+    printf '{"text":"%s","tooltip":"%s","class":"unmounted"}\n' \
+        "$(json_escape "$text")" "$(json_escape "$tooltip")"
 fi
--- a/.config/waybar/scripts/spotify-waybar.sh
+++ b/.config/waybar/scripts/spotify-waybar.sh
@@ -0,0 +1,218 @@
+#!/usr/bin/env bash
+set -u
+
+CACHE_DIR="${XDG_CACHE_HOME:-$HOME/.cache}/waybar-spotify"
+ART_URL_FILE="$CACHE_DIR/art_url"
+ART_FILE="$CACHE_DIR/cover.jpg"
+PLAYER=""
+
+mkdir -p "$CACHE_DIR"
+
+json_escape() {
+    local s="$1"
+    s=${s//\\/\\\\}
+    s=${s//\"/\\\"}
+    s=${s//$'\n'/\\n}
+    printf '%s' "$s"
+}
+
+markup_escape() {
+    local s="$1"
+    s=${s//&/&amp;}
+    s=${s//</&lt;}
+    s=${s//>/&gt;}
+    printf '%s' "$s"
+}
+
+icon_markup() {
+    local icon="$1"
+    local color="$2"
+    printf '<span font_desc="SauceCodePro Nerd Font 15" foreground="%s">%s</span>' "$color" "$icon"
+}
+
+truncate_text() {
+    local text="$1"
+    local max_len="$2"
+    if (( ${#text} <= max_len )); then
+        printf '%s' "$text"
+        return
+    fi
+    printf '%s...' "${text:0:max_len-3}"
+}
+
+pick_player() {
+    local candidates
+    local p
+    local c
+
+    mapfile -t candidates < <(playerctl -l 2>/dev/null)
+
+    if (( ${#candidates[@]} == 0 )); then
+        return 1
+    fi
+
+    for c in spotify spotifyd ncspot nspot; do
+        for p in "${candidates[@]}"; do
+            if [[ "$p" == "$c" || "$p" == "$c."* ]]; then
+                PLAYER="$p"
+                return 0
+            fi
+        done
+    done
+
+    PLAYER="${candidates[0]}"
+    return 0
+}
+
+download_cover_if_needed() {
+    local art_url="$1"
+
+    if [[ -z "$art_url" ]]; then
+        return
+    fi
+
+    local old_url=""
+    if [[ -f "$ART_URL_FILE" ]]; then
+        old_url=$(cat "$ART_URL_FILE" 2>/dev/null)
+    fi
+
+    if [[ "$art_url" == "$old_url" ]]; then
+        return
+    fi
+
+    printf '%s' "$art_url" > "$ART_URL_FILE"
+
+    if [[ "$art_url" == file://* ]]; then
+        local local_path="${art_url#file://}"
+        if [[ -f "$local_path" ]]; then
+            cp -f "$local_path" "$ART_FILE" 2>/dev/null || true
+        fi
+        return
+    fi
+
+    if command -v curl >/dev/null 2>&1; then
+        curl -LfsS --max-time 4 "$art_url" -o "$ART_FILE" 2>/dev/null || true
+    fi
+}
+
+open_cover() {
+    if [[ -f "$ART_FILE" ]]; then
+        xdg-open "$ART_FILE" >/dev/null 2>&1 &
+    fi
+}
+
+control_player() {
+    local action="$1"
+    case "$action" in
+        --toggle)
+            playerctl -p "$PLAYER" play-pause >/dev/null 2>&1 || true
+            ;;
+        --next)
+            playerctl -p "$PLAYER" next >/dev/null 2>&1 || true
+            ;;
+        --prev)
+            playerctl -p "$PLAYER" previous >/dev/null 2>&1 || true
+            ;;
+        --stop)
+            playerctl -p "$PLAYER" stop >/dev/null 2>&1 || true
+            ;;
+        --open-art)
+            open_cover
+            ;;
+    esac
+}
+
+if [[ $# -gt 0 ]]; then
+    control_player "$1"
+    exit 0
+fi
+
+if ! command -v playerctl >/dev/null 2>&1; then
+    printf '{"text":"%s","tooltip":"playerctl missing: install playerctl for media controls","class":"idle","alt":"idle"}\n' "$(json_escape "$(icon_markup "" "#A3BE8C")")"
+    exit 0
+fi
+
+if ! pick_player; then
+    printf '{"text":"%s","tooltip":"No active player","class":"idle","alt":"idle"}\n' "$(json_escape "$(icon_markup "" "#A3BE8C")")"
+    exit 0
+fi
+
+status=$(playerctl -p "$PLAYER" status 2>/dev/null || true)
+if [[ -z "$status" ]]; then
+    printf '{"text":"%s","tooltip":"No active player status","class":"idle","alt":"idle"}\n' "$(json_escape "$(icon_markup "" "#A3BE8C")")"
+    exit 0
+fi
+
+title=$(playerctl -p "$PLAYER" metadata xesam:title 2>/dev/null || true)
+artist=$(playerctl -p "$PLAYER" metadata xesam:artist 2>/dev/null || true)
+album=$(playerctl -p "$PLAYER" metadata xesam:album 2>/dev/null || true)
+art_url=$(playerctl -p "$PLAYER" metadata mpris:artUrl 2>/dev/null || true)
+
+state_class=$(printf '%s' "$status" | tr '[:upper:]' '[:lower:]')
+
+if [[ "$state_class" == "stopped" ]]; then
+    text_markup="<span foreground=\"#D8DEE9\">Stopped</span> $(icon_markup "" "#D08770") $(icon_markup "" "#A3BE8C")"
+    printf '{"text":"%s","class":"stopped","alt":"stopped"}\n' "$(json_escape "$text_markup")"
+    exit 0
+fi
+
+if [[ -z "$artist" && -z "$title" ]]; then
+    printf '{"text":"%s","class":"idle","alt":"idle"}\n' "$(json_escape "$(icon_markup "" "#A3BE8C")")"
+    exit 0
+fi
+
+if [[ -z "$title" ]]; then
+    title="Unknown title"
+fi
+if [[ -z "$artist" ]]; then
+    artist="Unknown artist"
+fi
+if [[ -z "$album" ]]; then
+    album="Unknown album"
+fi
+
+download_cover_if_needed "$art_url"
+
+display_track="$(truncate_text "$artist - $title" 52)"
+state_icon=""
+if [[ "$state_class" == "paused" ]]; then
+    state_icon=""
+fi
+
+app_icon=""
+if [[ "$PLAYER" == spotify* || "$PLAYER" == spotifyd* || "$PLAYER" == *ncspot* || "$PLAYER" == *nspot* ]]; then
+    app_icon=""
+fi
+
+track_color="#ECEFF4"
+state_color="#88C0D0"
+app_color="#A3BE8C"
+
+if [[ "$state_class" == "paused" ]]; then
+    track_color="#E5E9F0"
+    state_color="#EBCB8B"
+fi
+
+cover_line="Cover art: unavailable"
+if [[ -f "$ART_FILE" ]]; then
+    cover_line="Cover art: cached (right-click opens image)"
+fi
+
+tooltip=$(cat <<EOF
+$artist
+$title
+$album
+$status
+Player: $PLAYER
+$cover_line
+Left click: play/pause | Scroll: next/prev
+EOF
+)
+
+text_markup="<span foreground=\"$track_color\">$(markup_escape "$display_track")</span> $(icon_markup "$state_icon" "$state_color") $(icon_markup "$app_icon" "$app_color")"
+
+printf '{"text":"%s","tooltip":"%s","class":"%s","alt":"%s"}\n' \
+    "$(json_escape "$text_markup")" \
+    "$(json_escape "$tooltip")" \
+    "$(json_escape "$state_class")" \
+    "$(json_escape "$state_class")"
--- a/.config/waybar/scripts/weather-norrkoping.sh
+++ b/.config/waybar/scripts/weather-norrkoping.sh
@@ -0,0 +1,88 @@
+#!/usr/bin/env bash
+set -u
+
+LOCATION="Norrkoping"
+URL="https://wttr.in/${LOCATION}?format=%t|%C"
+
+json_escape() {
+    local s="$1"
+    s=${s//\\/\\\\}
+    s=${s//\"/\\\"}
+    s=${s//$'\n'/\\n}
+    printf '%s' "$s"
+}
+
+markup_escape() {
+    local s="$1"
+    s=${s//&/&amp;}
+    s=${s//</&lt;}
+    s=${s//>/&gt;}
+    printf '%s' "$s"
+}
+
+icon_markup() {
+    local icon="$1"
+    local color="$2"
+    printf '<span font_desc="SauceCodePro Nerd Font 15" foreground="%s">%s</span>' "$color" "$icon"
+}
+
+icon_for_condition() {
+    local c
+    c=$(printf '%s' "$1" | tr '[:upper:]' '[:lower:]')
+
+    case "$c" in
+        *thunder*|*storm*)
+            printf '󰖓'
+            ;;
+        *snow*|*sleet*|*blizzard*|*ice*)
+            printf '󰼶'
+            ;;
+        *rain*|*drizzle*|*shower*)
+            printf '󰖗'
+            ;;
+        *fog*|*mist*|*haze*|*smoke*)
+            printf '󰖑'
+            ;;
+        *partly*)
+            printf '󰖕'
+            ;;
+        *clear*|*sunny*)
+            printf '󰖙'
+            ;;
+        *cloud*|*overcast*)
+            printf '󰖐'
+            ;;
+        *)
+            printf '󰖐'
+            ;;
+    esac
+}
+
+if ! command -v curl >/dev/null 2>&1; then
+    text="<span foreground=\"#EBCB8B\">--°C Unavailable</span> $(icon_markup "󰖐" "#D08770")"
+    printf '{"text":"%s","tooltip":"curl is required for weather","class":"weather-unavailable"}\n' "$(json_escape "$text")"
+    exit 0
+fi
+
+raw=$(curl -fsS --max-time 6 "$URL" 2>/dev/null || true)
+if [[ -z "$raw" || "$raw" != *"|"* ]]; then
+    text="<span foreground=\"#EBCB8B\">--°C Unavailable</span> $(icon_markup "󰖐" "#D08770")"
+    printf '{"text":"%s","tooltip":"Weather unavailable for Norrkoping","class":"weather-unavailable"}\n' "$(json_escape "$text")"
+    exit 0
+fi
+
+temp=${raw%%|*}
+condition=${raw#*|}
+icon=$(icon_for_condition "$condition")
+updated=$(date '+%H:%M')
+text="<span foreground=\"#D8DEE9\">$(markup_escape "$temp $condition")</span> $(icon_markup "$icon" "#88C0D0")"
+tooltip=$(cat <<EOF
+Norrkoping, Sweden
+$temp - $condition
+Updated: $updated
+EOF
+)
+
+printf '{"text":"%s","tooltip":"%s","class":"weather"}\n' \
+    "$(json_escape "$text")" \
+    "$(json_escape "$tooltip")"
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -1,15 +1,15 @@
 * {
  border: none;
-  border-radius: 8px;
-  font-family: "SauceCodePro Nerd Font", "SauceCodePro Nerd Font Mono", "Symbols Nerd Font Mono", "Symbols Nerd Font", "Font Awesome 7 Free", sans-serif;
-  font-size: 14px;
+  border-radius: 10px;
+  font-family: "Ubuntu", "SauceCodePro Nerd Font", "SauceCodePro Nerd Font Mono", "Symbols Nerd Font Mono", "Symbols Nerd Font", "Font Awesome 7 Free", sans-serif;
+  font-size: 15px;
  min-height: 0;
 }

 window#waybar {
-  background: alpha(#2e3440, 0.92);
+  background: #2e3440;
  color: #eceff4;
-  border-bottom: 2px solid alpha(#5e81ac, 0.55);
+  border-bottom: 2px solid #5e81ac;
 }

 tooltip {
@@ -19,8 +19,10 @@ tooltip {
 }

 #workspaces {
-  background: alpha(#3b4252, 0.88);
+  background: #3b4252;
  padding: 2px 6px;
+  margin: 4px 3px;
+  border: 1px solid #4c566a;
 }

 #workspaces button {
@@ -31,7 +33,7 @@ tooltip {
 }

 #workspaces button:hover {
-  background: alpha(#4c566a, 0.55);
+  background: #434c5e;
 }

 #workspaces button.active {
@@ -45,6 +47,8 @@ tooltip {
 }

 #window,
+#custom-spotify,
+#custom-weather,
 #clock,
 #custom-screenshot,
 #idle_inhibitor,
@@ -55,40 +59,87 @@ tooltip {
 #tray,
 #custom-mount-data,
 #custom-mount-usb1 {
-  background: alpha(#3b4252, 0.88);
-  color: #eceff4;
+  background: #3b4252;
+  color: #e5e9f0;
  padding: 0 10px;
  margin: 4px 3px;
+  border: 1px solid #4c566a;
 }

 #clock {
-  background: alpha(#5e81ac, 0.35);
+  background: #34425a;
+  color: #eceff4;
+  border-color: #81a1c1;
+}
+
+#custom-spotify {
+  background: #3a4a3f;
+  color: #eceff4;
+  font-weight: 600;
+  border-color: #a3be8c;
+}
+
+#custom-spotify.paused {
+  background: #5b4f3b;
+  color: #eceff4;
+  border-color: #d08770;
+}
+
+#custom-spotify.stopped,
+#custom-spotify.idle {
+  background: #4c566a;
+  color: #d8dee9;
+  border-color: #616e88;
+}
+
+#custom-weather {
+  background: #34504f;
+  color: #eceff4;
+  font-weight: 600;
+  border-color: #88c0d0;
 }

 #cpu,
 #memory {
-  background: alpha(#81a1c1, 0.25);
+  background: #384b5e;
+  color: #eceff4;
+  border-color: #5e81ac;
 }

 #network {
-  background: alpha(#88c0d0, 0.22);
+  background: #2f4f5a;
+  color: #eceff4;
+  border-color: #81a1c1;
 }

 #network.disconnected {
-  color: #bf616a;
-  background: alpha(#bf616a, 0.18);
+  color: #eceff4;
+  background: #5a3942;
+  border-color: #d08770;
+}
+
+#pulseaudio {
+  background: #4b4256;
+  color: #eceff4;
+  border-color: #b48ead;
 }

 #pulseaudio.muted {
-  color: #ebcb8b;
+  color: #eceff4;
+  background: #5a433f;
+  border-color: #d08770;
 }

 #idle_inhibitor.activated {
-  color: #a3be8c;
+  color: #eceff4;
+  background: #3a4a3f;
+  border-color: #a3be8c;
 }

 #idle_inhibitor.deactivated {
-  color: #bf616a;
+  color: #eceff4;
+  background: #34425a;
+  border-color: #81a1c1;
 }

 #custom-mount-data,
@@ -98,12 +149,14 @@ tooltip {

 #custom-mount-data.mounted,
 #custom-mount-usb1.mounted {
-  color: #a3be8c;
-  background: alpha(#a3be8c, 0.12);
+  color: #eceff4;
+  background: #3a4a3f;
+  border-color: #a3be8c;
 }

 #custom-mount-data.unmounted,
 #custom-mount-usb1.unmounted {
-  color: #bf616a;
-  background: alpha(#bf616a, 0.16);
+  color: #eceff4;
+  background: #5a3942;
+  border-color: #d08770;
 }