push changes

This commit is contained in:
2026-04-21 21:38:35 +02:00
parent 4cbfa9464b
commit 01d3f91896
6 changed files with 58 additions and 58 deletions

View File

@@ -261,29 +261,29 @@ bind = $mainMod, right, movefocus, r
bind = $mainMod, up, movefocus, u
bind = $mainMod, down, movefocus, d
# Switch workspaces with mainMod + [0-9]
bind = $mainMod, 1, workspace, 1
bind = $mainMod, 2, workspace, 2
bind = $mainMod, 3, workspace, 3
bind = $mainMod, 4, workspace, 4
bind = $mainMod, 5, workspace, 5
bind = $mainMod, 6, workspace, 6
bind = $mainMod, 7, workspace, 7
bind = $mainMod, 8, workspace, 8
bind = $mainMod, 9, workspace, 9
bind = $mainMod, 0, workspace, 10
# Switch workspaces with mainMod + number row (layout-independent keycodes)
bind = $mainMod, code:11, workspace, 1
bind = $mainMod, code:10, workspace, 2
bind = $mainMod, code:12, workspace, 3
bind = $mainMod, code:13, workspace, 4
bind = $mainMod, code:14, workspace, 5
bind = $mainMod, code:15, workspace, 6
bind = $mainMod, code:16, workspace, 7
bind = $mainMod, code:17, workspace, 8
bind = $mainMod, code:18, workspace, 9
bind = $mainMod, code:19, workspace, 10
# Move active window to a workspace with mainMod + SHIFT + [0-9]
bind = $mainMod SHIFT, 1, movetoworkspace, 1
bind = $mainMod SHIFT, 2, movetoworkspace, 2
bind = $mainMod SHIFT, 3, movetoworkspace, 3
bind = $mainMod SHIFT, 4, movetoworkspace, 4
bind = $mainMod SHIFT, 5, movetoworkspace, 5
bind = $mainMod SHIFT, 6, movetoworkspace, 6
bind = $mainMod SHIFT, 7, movetoworkspace, 7
bind = $mainMod SHIFT, 8, movetoworkspace, 8
bind = $mainMod SHIFT, 9, movetoworkspace, 9
bind = $mainMod SHIFT, 0, movetoworkspace, 10
# Move active window to a workspace with mainMod + SHIFT + number row
bind = $mainMod SHIFT, code:11, movetoworkspace, 1
bind = $mainMod SHIFT, code:10, movetoworkspace, 2
bind = $mainMod SHIFT, code:12, movetoworkspace, 3
bind = $mainMod SHIFT, code:13, movetoworkspace, 4
bind = $mainMod SHIFT, code:14, movetoworkspace, 5
bind = $mainMod SHIFT, code:15, movetoworkspace, 6
bind = $mainMod SHIFT, code:16, movetoworkspace, 7
bind = $mainMod SHIFT, code:17, movetoworkspace, 8
bind = $mainMod SHIFT, code:18, movetoworkspace, 9
bind = $mainMod SHIFT, code:19, movetoworkspace, 10
# Example special workspace (scratchpad)
bind = $mainMod, S, togglespecialworkspace, magic

View File

@@ -6,7 +6,7 @@ wallpaper {
}
wallpaper {
monitor = DP-2
monitor = DP-1
path = /usr/share/backgrounds/nordic-wallpapers/archlinux.png
fit_mode = cover
}

View File

@@ -25,7 +25,7 @@
"format": "{id}"
},
"custom/screenshot": {
"exec": "printf '{\"text\": \"<span foreground=\\\"#E5E9F0\\\">Shot</span> <span font_desc=\\\"SauceCodePro Nerd Font 17\\\" foreground=\\\"#FFFFFF\\\">󰄀</span>\", \"tooltip\": \"Area screenshot: edit in Swappy, then choose save path and filename; Esc on filename uses screenshot\"}'",
"exec": "printf '{\"text\": \"<span font_desc=\\\"SauceCodePro Nerd Font 14\\\" foreground=\\\"#FFFFFF\\\">󰄀</span> <span foreground=\\\"#E5E9F0\\\">Shot</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",
@@ -35,8 +35,8 @@
"escape": false,
"format": "{icon}",
"format-icons": {
"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>"
"activated": "<span font_desc=\"SauceCodePro Nerd Font 14\" foreground=\"#A3BE8C\"> </span><span foreground=\"#A3BE8C\">Awake</span>",
"deactivated": "<span font_desc=\"SauceCodePro Nerd Font 14\" foreground=\"#81A1C1\"> </span><span foreground=\"#D8DEE9\">Idle</span>"
}
},
"tray": {
@@ -44,9 +44,9 @@
},
"clock": {
"escape": false,
"format": "<span foreground=\"#D8DEE9\">{:%H:%M}</span> <span font_desc=\"SauceCodePro Nerd Font 15\" foreground=\"#88C0D0\"></span>",
"format": "<span font_desc=\"SauceCodePro Nerd Font 14\" foreground=\"#88C0D0\"></span> <span foreground=\"#D8DEE9\">{:%H:%M}</span>",
"tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
"format-alt": "<span foreground=\"#D8DEE9\">{:%Y-%m-%d}</span> <span font_desc=\"SauceCodePro Nerd Font 15\" foreground=\"#81A1C1\"></span>"
"format-alt": "<span font_desc=\"SauceCodePro Nerd Font 14\" foreground=\"#81A1C1\"></span> <span foreground=\"#D8DEE9\">{:%Y-%m-%d}</span>"
},
"custom/spotify": {
"exec": "bash $HOME/.config/waybar/scripts/spotify-waybar.sh",
@@ -68,7 +68,7 @@
},
"cpu": {
"escape": false,
"format": "<span foreground=\"#D8DEE9\">{usage}%</span> <span font_desc=\"SauceCodePro Nerd Font 15\" foreground=\"#81A1C1\"></span>",
"format": "<span font_desc=\"SauceCodePro Nerd Font 14\" foreground=\"#81A1C1\"></span> <span foreground=\"#D8DEE9\">{usage}%</span>",
"tooltip": false,
"on-click": "alacritty -e btop"
},
@@ -91,30 +91,30 @@
},
"network": {
"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>",
"format-wifi": "<span font_desc=\"SauceCodePro Nerd Font 14\" foreground=\"#88C0D0\"> </span><span foreground=\"#D8DEE9\">{essid} ({signalStrength}%)</span>",
"format-ethernet": "<span font_desc=\"SauceCodePro Nerd Font 14\" foreground=\"#88C0D0\">󰈀 </span><span foreground=\"#D8DEE9\">{ipaddr}/{cidr}</span>",
"tooltip-format": "<span foreground=\"#D8DEE9\">{ifname} via {gwaddr}</span> <span font_desc=\"SauceCodePro Nerd Font 14\" foreground=\"#88C0D0\">󰈀</span>",
"format-linked": "<span font_desc=\"SauceCodePro Nerd Font 14\" foreground=\"#81A1C1\">󰈀 </span><span foreground=\"#D8DEE9\">{ifname} (No IP)</span>",
"format-disconnected": "<span font_desc=\"SauceCodePro Nerd Font 14\" foreground=\"#BF616A\">󰖪 </span><span foreground=\"#EBCB8B\">Disconnected</span>",
"format-alt": "<span font_desc=\"SauceCodePro Nerd Font 14\" foreground=\"#88C0D0\">󰈀 </span><span foreground=\"#D8DEE9\">{ifname}: {ipaddr}/{cidr}</span>",
"on-click-right": "nm-connection-editor"
},
"pulseaudio": {
"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": "{icon} {format_source} <span foreground=\"#D8DEE9\">{volume}%</span>",
"format-bluetooth": "<span font_desc=\"SauceCodePro Nerd Font 14\" foreground=\"#81A1C1\"></span> {icon} {format_source} <span foreground=\"#D8DEE9\">{volume}%</span>",
"format-bluetooth-muted": "<span font_desc=\"SauceCodePro Nerd Font 14\" foreground=\"#D08770\"></span> <span font_desc=\"SauceCodePro Nerd Font 14\" foreground=\"#81A1C1\"></span> {icon} {format_source}",
"format-muted": "<span font_desc=\"SauceCodePro Nerd Font 14\" foreground=\"#D08770\"></span> {format_source}",
"format-source": "<span font_desc=\"SauceCodePro Nerd Font 14\" foreground=\"#B48EAD\"></span> <span foreground=\"#D8DEE9\">{volume}%</span>",
"format-source-muted": "<span font_desc=\"SauceCodePro Nerd Font 14\" foreground=\"#D08770\"></span>",
"format-icons": {
"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>"]
"headphone": "<span font_desc=\"SauceCodePro Nerd Font 14\" foreground=\"#B48EAD\"></span>",
"hands-free": "<span font_desc=\"SauceCodePro Nerd Font 14\" foreground=\"#B48EAD\"></span>",
"headset": "<span font_desc=\"SauceCodePro Nerd Font 14\" foreground=\"#B48EAD\"></span>",
"phone": "<span font_desc=\"SauceCodePro Nerd Font 14\" foreground=\"#B48EAD\"></span>",
"portable": "<span font_desc=\"SauceCodePro Nerd Font 14\" foreground=\"#B48EAD\"></span>",
"car": "<span font_desc=\"SauceCodePro Nerd Font 14\" foreground=\"#B48EAD\"></span>",
"default": ["<span font_desc=\"SauceCodePro Nerd Font 14\" foreground=\"#B48EAD\"></span>", "<span font_desc=\"SauceCodePro Nerd Font 14\" foreground=\"#B48EAD\"></span>", "<span font_desc=\"SauceCodePro Nerd Font 14\" foreground=\"#B48EAD\"></span>"]
},
"on-click": "pavucontrol"
}

View File

@@ -26,17 +26,17 @@ markup_escape() {
icon_markup() {
local icon="$1"
local color="$2"
printf '<span font_desc="SauceCodePro Nerd Font 15" foreground="%s">%s</span>' "$color" "$icon"
printf '<span font_desc="SauceCodePro Nerd Font 14" 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)"
text="<span foreground=\"#D8DEE9\">$(markup_escape "$LABEL $used/$avail ($pcent)")</span> $(icon_markup "$ICON_MOUNT" "#A3BE8C")"
text="$(icon_markup "$ICON_MOUNT" "#A3BE8C") <span foreground=\"#D8DEE9\">$(markup_escape "$LABEL $used/$avail ($pcent)")</span>"
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
text="<span foreground=\"#EBCB8B\">$(markup_escape "$LABEL N/A")</span> $(icon_markup "$ICON_DOWN" "#BF616A")"
text="$(icon_markup "$ICON_DOWN" "#BF616A") <span foreground=\"#EBCB8B\">$(markup_escape "$LABEL N/A")</span>"
tooltip="$(markup_escape "$MOUNT is NOT mounted")"
printf '{"text":"%s","tooltip":"%s","class":"unmounted"}\n' \
"$(json_escape "$text")" "$(json_escape "$tooltip")"

View File

@@ -27,7 +27,7 @@ markup_escape() {
icon_markup() {
local icon="$1"
local color="$2"
printf '<span font_desc="SauceCodePro Nerd Font 15" foreground="%s">%s</span>' "$color" "$icon"
printf '<span font_desc="SauceCodePro Nerd Font 14" foreground="%s">%s</span>' "$color" "$icon"
}
truncate_text() {
@@ -151,7 +151,7 @@ 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")"
text_markup="$(icon_markup "" "#D08770") $(icon_markup " " "#A3BE8C")<span foreground=\"#D8DEE9\">Stopped</span>"
printf '{"text":"%s","class":"stopped","alt":"stopped"}\n' "$(json_escape "$text_markup")"
exit 0
fi
@@ -209,7 +209,7 @@ 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")"
text_markup="$(icon_markup "$state_icon" "$state_color") $(icon_markup "$app_icon " "$app_color")<span foreground=\"$track_color\">$(markup_escape "$display_track")</span>"
printf '{"text":"%s","tooltip":"%s","class":"%s","alt":"%s"}\n' \
"$(json_escape "$text_markup")" \

View File

@@ -23,7 +23,7 @@ markup_escape() {
icon_markup() {
local icon="$1"
local color="$2"
printf '<span font_desc="SauceCodePro Nerd Font 15" foreground="%s">%s</span>' "$color" "$icon"
printf '<span font_desc="SauceCodePro Nerd Font 14" foreground="%s">%s</span>' "$color" "$icon"
}
icon_for_condition() {
@@ -59,14 +59,14 @@ icon_for_condition() {
}
if ! command -v curl >/dev/null 2>&1; then
text="<span foreground=\"#EBCB8B\">--°C Unavailable</span> $(icon_markup "󰖐" "#D08770")"
text="$(icon_markup "󰖐 " "#D08770")<span foreground=\"#EBCB8B\">--°C Unavailable</span>"
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")"
text="$(icon_markup "󰖐 " "#D08770")<span foreground=\"#EBCB8B\">--°C Unavailable</span>"
printf '{"text":"%s","tooltip":"Weather unavailable for Norrkoping","class":"weather-unavailable"}\n' "$(json_escape "$text")"
exit 0
fi
@@ -75,7 +75,7 @@ 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")"
text="$(icon_markup "$icon " "#88C0D0")<span foreground=\"#D8DEE9\">$(markup_escape "$temp $condition")</span>"
tooltip=$(cat <<EOF
Norrkoping, Sweden
$temp - $condition