diff --git a/desktop/.config/waybar/config b/desktop/.config/waybar/config index 73a9027..0ead00c 100644 --- a/desktop/.config/waybar/config +++ b/desktop/.config/waybar/config @@ -5,7 +5,8 @@ "modules-right": ["river/mode", "custom/wireguard", "custom/archupdates", "pulseaudio", "backlight", "network", "cpu", "memory", "temperature", "battery", "tray"], "custom/archupdates": { "format": "{icon}", - "format-alt-click": "right", + "format-alt": "{} {icon}", + "format-alt-click": "click-right", "format-icons": { "default": "" }, @@ -17,17 +18,21 @@ "backlight": { "device": "intel_backlight", "format": "{icon}", + "format-alt": "{percent}% {icon}", + "format-alt-click": "click-right", "format-icons": ["󰛩", "󱩎", "󱩏", "󱩐", "󱩑", "󱩒", "󱩓", "󱩔", "󱩕", "󱩖", "󰛨"], "tooltip-format": "{percent}% {icon}", "on-scroll-up": "brightnessctl set 1%+", "on-scroll-down": "brightnessctl set 1%-" }, "battery": { - "format": "{capacity}% {icon}", + "format": "{icon}", + "format-warning": "{capacity}% {icon}", + "format-critical": "{capacity}% {icon}", "format-alt":"{capacity}% ({time}) {icon}", "format-alt-click": "click-right", "format-icons": ["", "", "", "", ""], - "interval": 60, + "interval": 10, "states": { "warning": 30, "critical": 15 @@ -41,6 +46,8 @@ "cpu": { "interval": 10, "format": "", + "format-alt": "{usage}% ", + "format-alt-click": "click-right", "max-length": 10, "states": { "warning": 50, @@ -54,7 +61,7 @@ "return-type": "json", "interval": 300, "on-click": "$TERMINAL start --class float ikhal", - "format": "{icon}{}", + "format": "{icon}{0}", // issue tracked here https://github.com/Alexays/Waybar/issues/3623 "format-icons": { "event": " ", "no-event": "", @@ -64,9 +71,9 @@ "interval": 30, "format": "{icon}", "format-alt": "{used:0.1f}G/{total:0.1f}G ", + "format-alt-click": "click-right", "tooltip": true, "tooltip-format": "{used:0.1f}G/{total:0.1f}G \nUsed: {percentage} %\nSwap: {swapPercentage} %", - "format-alt-click": "click-right", "format-icons": ["󰪞", "󰪟", "󰪠", "󰪡", "󰪢", "󰪣", "󰪤", "󰪥"], "max-length": 10 }, @@ -96,7 +103,7 @@ }, "custom/media": { "format": "{icon}{}", - "format-alt-click": "right", + "format-alt-click": "click-right", "return-type": "json", "format-icons": { "Playing": " ", @@ -111,14 +118,11 @@ }, "network": { "format": "{ifname}", - // "format-wifi": "{signalStrength}% ", - // "format-ethernet": "{ipaddr}/{cidr} 󰈀", - // shortformat: - "format-wifi": " ", + "format-wifi": "", "format-ethernet": "󰈀 ", "format-disconnected": "󰖪 ", "tooltip-format": "{ifname} via {gwaddr} 󰈁", - "tooltip-format-wifi": "{essid}: {bandwidthDownBits}-{bandwidthUpBits} ({signalStrength}%)  {ifname}", + "tooltip-format-wifi": "{essid}: {bandwidthDownBits}-{bandwidthUpBits} ({signalStrength}%)  {ifname}", "tooltip-format-ethernet": "{ifname} 󰈀", "tooltip-format-disconnected": "Disconnected", "max-length": 50, @@ -126,9 +130,11 @@ // "on-click-right": "sudo rfkill toggle wlan" }, "pulseaudio": { - "format": "{volume}% {icon}", + "format": "{icon}", + "format-alt": "{volume}% {icon}", "format-bluetooth": "{volume}% {icon} ", - "format-muted": "", + "format-alt-click": "click-right", + "format-muted": "󰖁", "format-icons": { "headphone": "", "hands-free": "", @@ -136,22 +142,24 @@ "phone": "", "portable": "", "car": "", - "default": ["", ""] + "default": ["", "", ""] }, - "scroll-step": 1, + "scroll-step": 2, "on-click": "$TERMINAL start --class float pulsemixer", "on-scroll-up": "pactl set-sink-volume @DEFAULT_SINK@ +1%", "on-scroll-down": "pactl set-sink-volume @DEFAULT_SINK@ -1%" }, "river/tags": { "num-tags": 10, - "tag-labels": [ "", "", "", "", "", "", "", "", "", "" ] + "tag-labels": [ "", "", "", "", "", "", "", "", "", "" ], }, "river/mode": { "format": "{} ", }, "river/window": { - "format": " {}", + "format": " ", + "format-alt": " {}", + "format-alt-click": "click-right", "max-length": 70 }, "temperature": { @@ -161,7 +169,7 @@ // "format-critical": "{temperatureC}° ", "format": "", "format-alt": "{temperatureC}° ", - "format-alt-click": "right", + "format-alt-click": "click-right", "on-click": "$TERMINAL start --class float watch sensors" }, "tray": { @@ -180,18 +188,20 @@ "pia": "󰖂", "netbird": "󱗆" }, + "format-alt": "{} {icon}", + "format-alt-click": "click-right", "exec": "~/.config/waybar/modules/wireguard json", "exec-if": "command -v nmcli >/dev/null 2>&1", "return-type": "json", "signal": 6, - "interval": 60, + "interval": 20, }, "custom/vidl": { "format": "", - "format-alt": "{}  ", - "format-alt-click": "right", + "format-alt": " {}", + "format-alt-click": "click-right", "exec": "wc -l ~/.local/share/vidl/vidl_queue | cut -d' ' -f1", - "exec-if": "[ -f ~/.local/share/vidl/vidl_queue ] && [ $(wc -l ~/.local/share/vidl/vidl_queue | cut -d' ' -f1) -gt 0 ]", + "exec-if": "[ $(vidl -p) = 'running' ] && [ $(vidl -P) -gt 0 ]", "interval": 5, "on-click": "$TERMINAL start --class float nvim ~/.local/share/vidl/vidl_queue" }, diff --git a/desktop/.config/waybar/style.css b/desktop/.config/waybar/style.css index 348a579..5d210fe 100644 --- a/desktop/.config/waybar/style.css +++ b/desktop/.config/waybar/style.css @@ -45,6 +45,13 @@ window#waybar.hidden { color: @base0C; } +/* give coherent background */ +.modules-right { + padding: 0; + margin: 0; + background-color: @base01; +} + #clock, #battery, #cpu, @@ -64,7 +71,7 @@ window#waybar.hidden { #custom-events, #custom-vidl, #custom-media { - padding: 0 10px; + padding: 0 5px; margin: 0 5px; color: @base05; background-color: @base01; @@ -84,6 +91,10 @@ window#waybar.hidden { background-color: @base02; } +#mode.interact_float { + background-color: @base0D; +} + /* Mark active output through highlighted window background */ #window { background-color: transparent;