diff --git a/roles/waybar/files/waybar/config b/roles/waybar/files/waybar/config index aeb0ee8..3143d9c 100644 --- a/roles/waybar/files/waybar/config +++ b/roles/waybar/files/waybar/config @@ -4,7 +4,7 @@ "modules-left": ["sway/workspaces", "sway/mode", "sway/window"], "modules-center": [], - "modules-right": ["tray", "custom/spotify", "cpu", "memory", "network#speed", "custom/zfs", "pulseaudio", "backlight", "network", "custom/vpn", "battery", "clock"], + "modules-right": ["custom/spotify", "cpu", "memory", "custom/zfs", "network#speed", "pulseaudio", "backlight", "network", "custom/vpn", "battery", "clock", "tray"], "sway/mode": { "format": " {}" }, @@ -87,9 +87,7 @@ "exec" : "~/.config/waybar/modules/nixos-kernel.sh" }, "backlight": { - "format": "{icon}", - "format-alt": "{percent}% {icon}", - "format-alt-click": "click-right", + "format": "{icon} {percent}%", "format-icons": [""], "on-scroll-down": "light -A 5", "on-scroll-up": "light -U 5" diff --git a/roles/waybar/files/waybar/style.css b/roles/waybar/files/waybar/style.css index 0d77b69..d86f064 100644 --- a/roles/waybar/files/waybar/style.css +++ b/roles/waybar/files/waybar/style.css @@ -9,10 +9,8 @@ @define-color red rgba(34, 34, 34, 0.4); @define-color yellow rgba(243, 249, 157, 1); -@define-color green rgba(34, 34, 34, 0.4); @define-color blue rgba(10, 108, 245, 1); @define-color purple rgba(159, 120, 255, 1); -@define-color cyan rgba(34, 34, 34, 0.4); * { border: none; @@ -67,14 +65,6 @@ window { border-bottom: 2px solid @purple; } -#network#speed { - border-bottom: 2px solid @red; -} - -#pulseaudio { - border-bottom: 2px solid @alert; -} - #battery { border-bottom: 2px solid @yellow; }