diff options
Diffstat (limited to 'waybar')
| -rw-r--r-- | waybar/config | 58 | ||||
| -rw-r--r-- | waybar/style.css | 11 |
2 files changed, 35 insertions, 34 deletions
diff --git a/waybar/config b/waybar/config index 03f9e3e..4b775ce 100644 --- a/waybar/config +++ b/waybar/config @@ -1,55 +1,41 @@ { "height": 30, "spacing": 4, - "modules-left": ["sway/workspaces", "sway/mode"], - "modules-center": ["sway/window"], - "modules-right": ["tray", "custom/lock", "custom/scratchpad_indicator", "network#vpnovpn", "network#vpnwg", "network#e", "network#wl", "network", "cpu", "memory", "backlight", "pulseaudio", "battery", "clock"], - "custom/spotify": { - "exec": "/usr/bin/python3 ~/.config/waybar/scripts/mediaplayer.py --player spotify", - "format": "{}", - "return-type": "json", - "on-click": "playerctl play-pause", - "on-scroll-up": "playerctl next", - "on-scroll-down": "playerctl previous" - }, - "sway/workspaces": { + "layer": "top", + "modules-left": ["hyprland/workspaces", "hyprland/window"], + "modules-center": [], + "modules-right": ["tray", "idle_inhibitor", "network#vpnovpn", "network#vpnwg", "network#e", "network#wl", "network", "cpu", "memory", "backlight", "pulseaudio", "battery", "clock"], + "hyprland/workspaces": { "disable-scroll": true, "all-outputs": false, "format": "{name}", }, - "sway/window": { - "max-length": 80, - "tooltip": false, - "rewrite": { - "": "Desktop", - } + "hyprland/window": { + "separate-outputs": true, }, "tray": { "spacing": 10 }, - "custom/scratchpad_indicator": { - "interval": 1, - "exec": "swaymsg -t get_tree | ~/.config/waybar/scripts/scratchpads.py", - "format": " {} ", - "on-click": "swaymsg 'scratchpad show'", - "on-click-right": "swaymsg 'move scratchpad'" - }, "clock": { "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>", "format": "{:%d %b %H:%M:%OS}", "format-alt": "{:%Y-%m-%d}", - "timezone": "Europe/London", "interval": 1 }, "battery": { "interval": 1, "states": { + "full": 100, + "normal": 99, "warning": 30, "critical": 15, }, "format": "{icon} {capacity}%", + "design-capacity": false, "format-charging": "{icon} {capacity}% ", - "format-icons": [" ", " ", " ", " ", " "], + "format-charging-full": " {capacity}% ", + "format-icons": ["", "", "", "", "", "", "", "", "", "", ""], + "tooltip-format": "{timeTo} ({power} W)" }, "backlight": { "format": "{icon} {percent}%", @@ -59,10 +45,15 @@ }, "cpu": { "format": " {usage}%", - "tooltip": false + "tooltip": true }, "memory": { - "format": " {used}/{total} GiB" + "format": " {percentage}%", + "format-alt": " {used}/{total} GiB", + "states": { + "high": 80 + }, + "tooltip": true }, "network": { "format-disconnected": " Disconnected", @@ -84,7 +75,7 @@ "tooltip-format": "{ipaddr}: {ifname} via {gwaddr}", "format-linked": " {ifname} (No IP)", "format-alt": " {ifname}: {ipaddr}/{cidr}", - "on-click-right": "alacritty -e /usr/bin/nmtui", + "on-click-right": "alacritty -e /bin/bash -c \"/usr/bin/sleep 0.5 && /usr/bin/nmtui\"", "format-disconnected": "", }, "network#vpnovpn": { @@ -102,8 +93,8 @@ "pulseaudio": { "format": "{icon} {volume}% {format_source}", "format-bluetooth": " {volume}% {format_source}", - "format-bluetooth-muted": " 0% {format_source}", - "format-muted": "婢0% {format_source}", + "format-bluetooth-muted": " 0% {format_source}", + "format-muted": " {format_source}", "format-source": " {volume}%", "format-source-muted": " 0%", "format-icons": { @@ -113,10 +104,11 @@ "phone": "", "portable": "", "car": " ", - "default": ["", " ", " "] + "default": [" ", " ", " "] }, "on-click": "pactl set-sink-mute @DEFAULT_SINK@ toggle", "on-click-right": "pavucontrol", + "ignored-sinks": ["Easy Effects Sink"], "scroll-step": 0.5 }, "idle_inhibitor": { diff --git a/waybar/style.css b/waybar/style.css index 3e53a9d..76dbfc5 100644 --- a/waybar/style.css +++ b/waybar/style.css @@ -10,6 +10,7 @@ window#waybar { border-bottom: 3px solid #434e59; transition-property: background-color; transition-duration: .5s; + background-clip: border-box; } window#waybar.hidden { @@ -41,7 +42,7 @@ button { background: rgba(0, 0, 0, 0.2); } -#workspaces button.focused { +#workspaces button.active { background-color: #434e59; } @@ -79,6 +80,14 @@ button { margin: 0 4px; } +#battery.charging.critical { + background: none; +} + +#battery.critical { + background: #eb4d4b; +} + /* If workspaces is the leftmost module, omit left margin */ .modules-left > widget:first-child > #workspaces { margin-left: 0; |