diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc index 5d95ab3..2ff3b9d 100644 --- a/.config/waybar/config.jsonc +++ b/.config/waybar/config.jsonc @@ -6,52 +6,20 @@ "modules-left": [ "sway/workspaces", - "custom/right-arrow-dark" - ], - "modules-center": [ - "custom/left-arrow-dark", - "sway/window", - "custom/right-arrow-dark" + "sway/window" ], + "modules-center": [], "modules-right": [ - "custom/left-arrow-dark", "pulseaudio", - "custom/left-arrow-light", - "custom/left-arrow-dark", - "custom/network", - "custom/left-arrow-light", - "custom/left-arrow-dark", - "custom/disk", - "custom/left-arrow-light", - "custom/left-arrow-dark", + "custom/network", + "custom/disk", "memory", - "custom/left-arrow-light", - "custom/left-arrow-dark", "custom/top", - "custom/left-arrow-light", - "custom/left-arrow-dark", - "battery", - "custom/left-arrow-light", - "custom/left-arrow-dark", + "battery", "clock#0", - "custom/left-arrow-light", - "custom/left-arrow-dark", "tray" ], - "custom/left-arrow-dark": { - "format": "", - "tooltip": false - }, - "custom/left-arrow-light": { - "format": "", - "tooltip": false - }, - "custom/right-arrow-dark": { - "format": "", - "tooltip": false - }, - "sway/workspaces": { "disable-scroll": true, "format": "{name}" @@ -69,14 +37,6 @@ "tooltip": true }, - "clock#2": { - "format": "{:%H:%M}", - "tooltip": false - }, - "clock#3": { - "format": "{:%d/%m}", - "tooltip": false - }, "clock#0": { "format": "{:%H:%M %d/%m/%y}", "tooltip": false @@ -84,7 +44,7 @@ "pulseaudio": { "format": "{icon} {volume:2}%", - "format-bluetooth": "{icon} {volume}%", + "format-bluetooth": "{icon} {volume}%", "format-muted": "MUTE", "format-icons": { "headphones": "", @@ -99,7 +59,7 @@ }, "memory": { "interval": 5, - "format": " {}%" + "format": " {}%" }, "custom/top": { "exec": "~/.config/waybar/top.sh", diff --git a/.config/waybar/style.css b/.config/waybar/style.css index a9d2135..022196d 100644 --- a/.config/waybar/style.css +++ b/.config/waybar/style.css @@ -1,6 +1,6 @@ * { font-size: 13px; - font-family: monospace; + font-family: JetBrainsMono NFP; } window#waybar { @@ -8,21 +8,10 @@ window#waybar { color: #fbf1c7; } -#custom-right-arrow-dark, -#custom-left-arrow-dark { - color: #1d2021; -} -#custom-right-arrow-light, -#custom-left-arrow-light { - color: #282828; - background: #1d2021; -} - +/* All widgets share a stylized rounded background */ #workspaces, #window, -#clock.0, -#clock.2, -#clock.3, +#clock, #pulseaudio, #memory, #custom-top, @@ -31,47 +20,30 @@ window#waybar { #custom-network, #tray { background: #1d2021; + border-radius: 6px; + margin: 4px 3px; + padding: 0 10px; + color: #f5d67b; +} + +#tray { + padding: 0 6px; } +/* Workspaces: dimmed inactive, bold yellow active */ #workspaces button { - padding: 0 2px; + padding: 0 6px; color: #a89984; + background: transparent; + border-radius: 4px; } #workspaces button.focused { - color: #fabd2f; + color: #f5d67b; + background: transparent; font-weight: bold; - /* border-bottom: 2px solid #fabd2f; */ } #workspaces button:hover { box-shadow: inherit; text-shadow: inherit; -} -#workspaces button:hover { - background: #1d2021; - border: #1d2021; - padding: 0 3px; -} - -/* Right-side widgets: lighter sandy yellow */ -#window, -#clock, -#pulseaudio, -#memory, -#custom-top, -#battery, -#custom-disk, -#custom-network, -#tray { - color: #f5d67b; -} - -#window, -#clock, -#pulseaudio, -#memory, -#custom-top, -#battery, -#custom-disk, -#custom-network { - padding: 0 10px; + background: #32302f; }