diff --git a/bin/waybar_khal.py b/bin/waybar_khal.py
index 4b7b64f..feeff52 100755
--- a/bin/waybar_khal.py
+++ b/bin/waybar_khal.py
@@ -49,11 +49,11 @@ for i in range(len(title)):
## ongoing
if ts_start < ts_now:
if ts_start < ts_now and ts_now < ts_end:
- text = f"{t_start[1]} - {t_end[1]} {t}"
+ text = f"{t_start[1]}-{t_end[1]} {t}"
alt = "now"
## upcoming
elif text == "-":
- text = f"{t_start[1]} - {t_end[1]} {t}"
+ text = f"{t_start[1]}-{t_end[1]} {t}"
alt = "today"
line = f"{t_start[1]} - {t_end[1]}: {t}"
tooltip += f"\n{line}"
diff --git a/waybar.d/config b/waybar.d/config
index c490ed7..d7948f3 100644
--- a/waybar.d/config
+++ b/waybar.d/config
@@ -8,24 +8,26 @@
"height": 25,
"modules-left": [
"sway/workspaces",
- "custom/separator#left"
+ "custom/separator#left",
+ "custom/separator#space"
],
"modules-center": [
"custom/separator#right",
"custom/media",
"custom/separator#center",
"pulseaudio",
- "custom/separator#left"
+ "custom/separator#center",
+ "custom/card",
+ "custom/separator#center",
+ "custom/mail",
+ "custom/separator#left",
+ "custom/separator#space"
],
"modules-right": [
- "custom/separator#right",
- "custom/card",
- "custom/separator#right",
- "custom/mail",
"custom/separator#right",
"network#wl0",
- "network#en0",
- "network#vpn0",
+ // "network#en0",
+ // "network#vpn0",
"custom/separator#right",
"cpu",
"memory",
@@ -37,25 +39,30 @@
"tray"
],
"custom/separator#left": {
- "format": " ❯ "
+ "format": "❯"
+ },
+ "custom/separator#space": {
+ "format": " "
},
"custom/separator#center": {
- // "format": " "
- "format": " | "
+ // "format": ""
+ "format": "|"
},
"custom/separator#right": {
- "format": " ❮ "
+ "format": "❮"
},
"custom/calendar": {
"format": "{icon} {}",
"tooltip-format": "{}",
"tooltip": true,
"return-type": "json",
+ "min-length": 25,
+ "max-length": 40,
"interval": 300,
"format-icons": {
- "now": " ",
- "today": " ",
- "idle": " "
+ "now": "",
+ "today": "",
+ "idle": ""
},
"escape": false,
"exec": "$HOME/.config/sway/bin/waybar_khal.py 2> /dev/null",
@@ -85,8 +92,8 @@
"max-length": 6,
"interval": 30,
"format-icons": {
- "unread": " ",
- "read": " "
+ "unread": "",
+ "read": ""
},
"escape": true,
"exec": "$HOME/.config/sway/bin/waybar_mail.py 2> /dev/null"
@@ -96,8 +103,8 @@
"tooltip-format": "{}",
"tooltip": true,
"return-type": "json",
- "min-length": 30,
- "max-length": 40,
+ "min-length": 10,
+ "max-length": 30,
"format-icons": {
"chromium": " ",
"firefox": " ",
@@ -108,11 +115,13 @@
"exec": "$HOME/.config/sway/bin/waybar_mediaplayer.py 2> /dev/null"
},
"clock": {
- "format": " {: %a, %b %d, %H:%M}",
+ "format": "{: %b %d, %H:%M}",
"on-click": "foot -T float khal interactive"
},
"cpu": {
- "format": " {usage:3}%",
+ "format": "{usage:3}%",
+ "min-length": 6,
+ "max-length": 10,
"states": {
"warning": 70,
"critical": 90
@@ -120,7 +129,9 @@
"on-click": "foot -T float bashtop"
},
"memory": {
- "format": " {}%",
+ "format": "{}%",
+ "min-length": 6,
+ "max-length": 10,
"states": {
"warning": 70,
"critical": 90
@@ -134,19 +145,20 @@
"warning": 30,
"critical": 15
},
- "format": "{icon} {capacity:3}%",
- "format-charging": " {capacity:3}%",
+ "format": "{icon}{capacity:3}%",
+ "format-charging": "{capacity:3}%",
"format-icons": ["", "", "", "", ""]
},
"network#wl0": {
"interval": 2,
"interface": "wl0",
"format": "{ifname}",
- "format-wifi": " {ifname} {essid} ({signalStrength:3}%)",
- "format-ethernet": " {ifname}",
+ "format-wifi": " {ifname}",
"format-linked": " {ifname}",
"format-disconnected": "{ifname}",
- "tooltip-format": "{ifname}\n\t{ipaddr}/{cidr}\n \t{bandwidthDownBits}\n \t{bandwidthUpBits}",
+ "min-length": 8,
+ "max-length": 30,
+ "tooltip-format": "{ifname} {essid} ({signalStrength:3}%)\n\t{ipaddr}/{cidr}\n \t{bandwidthDownBits}\n \t{bandwidthUpBits}",
"tooltip-format-linked": "{ifname} linked",
"tooltip-format-disconnected": "{ifname} disconnected",
"on-click": "foot -T float nmtui"
@@ -179,11 +191,11 @@
},
"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": " ",
+ "format-bluetooth": "{icon} {volume}% {format_source}",
+ "format-bluetooth-muted": "{icon}{format_source}",
+ "format-source": "",
+ "format-source-muted": "",
"format-icons": {
"headphone": "🎧",
"hands-free": "",
@@ -193,11 +205,11 @@
"car": "",
"default": ["", "", ""]
},
- "min-length": 9,
- "max-length": 20,
+ "min-length": 7,
+ "max-length": 12,
"on-click": "$HOME/.config/sway/bin/sway_volume mute",
- "on-click-middle": "$HOME/.config/sway/bin/sway_volume gui",
- "on-click-right": "$HOME/.config/sway/bin/sway_volume source-mute",
+ "on-click-middle": "$HOME/.config/sway/bin/sway_volume source-mute",
+ "on-click-right": "$HOME/.config/sway/bin/sway_volume gui",
"on-scroll-up": "$HOME/.config/sway/bin/sway_volume increase",
"on-scroll-down": "$HOME/.config/sway/bin/sway_volume decrease-mute"
},
diff --git a/waybar.d/config_7DPQTN2 b/waybar.d/config_7DPQTN2
index 2c760a6..263c277 100644
--- a/waybar.d/config_7DPQTN2
+++ b/waybar.d/config_7DPQTN2
@@ -8,7 +8,8 @@
"height": 25,
"modules-left": [
"sway/workspaces",
- "custom/separator#left"
+ "custom/separator#left",
+ "custom/separator#space"
],
"modules-center": [
"custom/separator#right",
@@ -37,25 +38,30 @@
"tray"
],
"custom/separator#left": {
- "format": " ❯ "
+ "format": "❯"
+ },
+ "custom/separator#space": {
+ "format": " "
},
"custom/separator#center": {
- // "format": " "
- "format": " | "
+ // "format": ""
+ "format": "|"
},
"custom/separator#right": {
- "format": " ❮ "
+ "format": "❮"
},
"custom/calendar": {
"format": "{icon} {}",
"tooltip-format": "{}",
"tooltip": true,
"return-type": "json",
+ "min-length": 25,
+ "max-length": 40,
"interval": 300,
"format-icons": {
- "now": " ",
- "today": " ",
- "idle": " "
+ "now": "",
+ "today": "",
+ "idle": ""
},
"escape": false,
"exec": "$HOME/.config/sway/bin/waybar_khal.py 2> /dev/null",
@@ -85,8 +91,8 @@
"max-length": 6,
"interval": 30,
"format-icons": {
- "unread": " ",
- "read": " "
+ "unread": "",
+ "read": ""
},
"escape": true,
"exec": "$HOME/.config/sway/bin/waybar_mail.py 2> /dev/null"
@@ -96,8 +102,8 @@
"tooltip-format": "{}",
"tooltip": true,
"return-type": "json",
- "min-length": 30,
- "max-length": 40,
+ "min-length": 10,
+ "max-length": 30,
"format-icons": {
"chromium": " ",
"firefox": " ",
@@ -108,11 +114,13 @@
"exec": "$HOME/.config/sway/bin/waybar_mediaplayer.py 2> /dev/null"
},
"clock": {
- "format": " {: %a, %b %d, %H:%M}",
+ "format": "{: %b %d, %H:%M}",
"on-click": "foot -T float khal interactive"
},
"cpu": {
- "format": " {usage:3}%",
+ "format": "{usage:3}%",
+ "min-length": 6,
+ "max-length": 10,
"states": {
"warning": 70,
"critical": 90
@@ -120,7 +128,9 @@
"on-click": "foot -T float bashtop"
},
"memory": {
- "format": " {}%",
+ "format": "{}%",
+ "min-length": 6,
+ "max-length": 10,
"states": {
"warning": 70,
"critical": 90
@@ -134,19 +144,20 @@
"warning": 30,
"critical": 15
},
- "format": "{icon} {capacity:3}%",
- "format-charging": " {capacity:3}%",
+ "format": "{icon}{capacity:3}%",
+ "format-charging": "{capacity:3}%",
"format-icons": ["", "", "", "", ""]
},
"network#wl0": {
"interval": 2,
"interface": "wl0",
"format": "{ifname}",
- "format-wifi": " {ifname} {essid} ({signalStrength:3}%)",
- "format-ethernet": " {ifname}",
+ "format-wifi": " {ifname}",
"format-linked": " {ifname}",
"format-disconnected": "{ifname}",
- "tooltip-format": "{ifname}\n\t{ipaddr}/{cidr}\n \t{bandwidthDownBits}\n \t{bandwidthUpBits}",
+ "min-length": 8,
+ "max-length": 30,
+ "tooltip-format": "{ifname} {essid} ({signalStrength:3}%)\n\t{ipaddr}/{cidr}\n \t{bandwidthDownBits}\n \t{bandwidthUpBits}",
"tooltip-format-linked": "{ifname} linked",
"tooltip-format-disconnected": "{ifname} disconnected",
"on-click": "foot -T float nmtui"
@@ -179,11 +190,11 @@
},
"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": " ",
+ "format-bluetooth": "{icon} {volume}% {format_source}",
+ "format-bluetooth-muted": "{icon}{format_source}",
+ "format-source": "",
+ "format-source-muted": "",
"format-icons": {
"headphone": "🎧",
"hands-free": "",
@@ -193,11 +204,11 @@
"car": "",
"default": ["", "", ""]
},
- "min-length": 9,
- "max-length": 20,
+ "min-length": 7,
+ "max-length": 12,
"on-click": "$HOME/.config/sway/bin/sway_volume mute",
- "on-click-middle": "$HOME/.config/sway/bin/sway_volume gui",
- "on-click-right": "$HOME/.config/sway/bin/sway_volume source-mute",
+ "on-click-middle": "$HOME/.config/sway/bin/sway_volume source-mute",
+ "on-click-right": "$HOME/.config/sway/bin/sway_volume gui",
"on-scroll-up": "$HOME/.config/sway/bin/sway_volume increase",
"on-scroll-down": "$HOME/.config/sway/bin/sway_volume decrease-mute"
},
diff --git a/waybar.d/config_annoyance b/waybar.d/config_annoyance
index c60efe3..5264bc1 100644
--- a/waybar.d/config_annoyance
+++ b/waybar.d/config_annoyance
@@ -8,51 +8,61 @@
"height": 25,
"modules-left": [
"sway/workspaces",
- "custom/separator#left"
+ "custom/separator#left",
+ "custom/separator#space"
],
"modules-center": [
"custom/separator#right",
"custom/media",
"custom/separator#center",
"pulseaudio",
- "custom/separator#left"
+ "custom/separator#center",
+ "custom/card",
+ "custom/separator#center",
+ "custom/mail",
+ "custom/separator#left",
+ "custom/separator#space"
],
"modules-right": [
"custom/separator#right",
- "custom/card",
- "custom/separator#right",
- "custom/mail",
- "custom/separator#right",
+ // "network#wl0",
"network#en0",
- "network#vpn0",
+ // "network#vpn0",
"custom/separator#right",
"cpu",
"memory",
"custom/separator#right",
+ // "battery",
+ // "custom/separator#right",
"custom/calendar",
"clock",
"tray"
],
"custom/separator#left": {
- "format": " ❯ "
+ "format": "❯"
+ },
+ "custom/separator#space": {
+ "format": " "
},
"custom/separator#center": {
- // "format": " "
- "format": " | "
+ // "format": ""
+ "format": "|"
},
"custom/separator#right": {
- "format": " ❮ "
+ "format": "❮"
},
"custom/calendar": {
"format": "{icon} {}",
"tooltip-format": "{}",
"tooltip": true,
"return-type": "json",
+ "min-length": 25,
+ "max-length": 40,
"interval": 300,
"format-icons": {
- "now": " ",
- "today": " ",
- "idle": " "
+ "now": "",
+ "today": "",
+ "idle": ""
},
"escape": false,
"exec": "$HOME/.config/sway/bin/waybar_khal.py 2> /dev/null",
@@ -82,8 +92,8 @@
"max-length": 6,
"interval": 30,
"format-icons": {
- "unread": " ",
- "read": " "
+ "unread": "",
+ "read": ""
},
"escape": true,
"exec": "$HOME/.config/sway/bin/waybar_mail.py 2> /dev/null"
@@ -93,8 +103,8 @@
"tooltip-format": "{}",
"tooltip": true,
"return-type": "json",
- "min-length": 30,
- "max-length": 40,
+ "min-length": 10,
+ "max-length": 30,
"format-icons": {
"chromium": " ",
"firefox": " ",
@@ -105,11 +115,13 @@
"exec": "$HOME/.config/sway/bin/waybar_mediaplayer.py 2> /dev/null"
},
"clock": {
- "format": " {: %a, %b %d, %H:%M}",
+ "format": "{: %b %d, %H:%M}",
"on-click": "foot -T float khal interactive"
},
"cpu": {
- "format": " {usage:3}%",
+ "format": "{usage:3}%",
+ "min-length": 6,
+ "max-length": 10,
"states": {
"warning": 70,
"critical": 90
@@ -117,7 +129,9 @@
"on-click": "foot -T float bashtop"
},
"memory": {
- "format": " {}%",
+ "format": "{}%",
+ "min-length": 6,
+ "max-length": 10,
"states": {
"warning": 70,
"critical": 90
@@ -131,19 +145,20 @@
"warning": 30,
"critical": 15
},
- "format": "{icon} {capacity:3}%",
- "format-charging": " {capacity:3}%",
+ "format": "{icon}{capacity:3}%",
+ "format-charging": "{capacity:3}%",
"format-icons": ["", "", "", "", ""]
},
"network#wl0": {
"interval": 2,
"interface": "wl0",
"format": "{ifname}",
- "format-wifi": " {ifname} {essid} ({signalStrength:3}%)",
- "format-ethernet": " {ifname}",
+ "format-wifi": " {ifname}",
"format-linked": " {ifname}",
"format-disconnected": "{ifname}",
- "tooltip-format": "{ifname}\n\t{ipaddr}/{cidr}\n \t{bandwidthDownBits}\n \t{bandwidthUpBits}",
+ "min-length": 8,
+ "max-length": 30,
+ "tooltip-format": "{ifname} {essid} ({signalStrength:3}%)\n\t{ipaddr}/{cidr}\n \t{bandwidthDownBits}\n \t{bandwidthUpBits}",
"tooltip-format-linked": "{ifname} linked",
"tooltip-format-disconnected": "{ifname} disconnected",
"on-click": "foot -T float nmtui"
@@ -176,11 +191,11 @@
},
"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": " ",
+ "format-bluetooth": "{icon} {volume}% {format_source}",
+ "format-bluetooth-muted": "{icon}{format_source}",
+ "format-source": "",
+ "format-source-muted": "",
"format-icons": {
"headphone": "🎧",
"hands-free": "",
@@ -188,13 +203,13 @@
"phone": "",
"portable": "",
"car": "",
- "default": ["", "", ""]
+ "default": ["", "", ""]
},
- "min-length": 9,
- "max-length": 20,
+ "min-length": 7,
+ "max-length": 12,
"on-click": "$HOME/.config/sway/bin/sway_volume mute",
- "on-click-middle": "$HOME/.config/sway/bin/sway_volume gui",
- "on-click-right": "$HOME/.config/sway/bin/sway_volume source-mute",
+ "on-click-middle": "$HOME/.config/sway/bin/sway_volume source-mute",
+ "on-click-right": "$HOME/.config/sway/bin/sway_volume gui",
"on-scroll-up": "$HOME/.config/sway/bin/sway_volume increase",
"on-scroll-down": "$HOME/.config/sway/bin/sway_volume decrease-mute"
},