From 8e99534112fa5ce0ed087240445e8e0acea32963 Mon Sep 17 00:00:00 2001 From: Benjamin Palko Date: Wed, 14 Aug 2024 17:07:18 -0400 Subject: [PATCH] aggregate --- waybar/config.jsonc | 8 +- waybar/style.css | 114 ++++++++++++++++++++++---- waybar/styles/module-groups.css | 14 ---- waybar/styles/modules.css | 13 --- waybar/styles/modules/clock.css | 7 -- waybar/styles/modules/cpu.css | 2 - waybar/styles/modules/idle.css | 12 --- waybar/styles/modules/memory.css | 2 - waybar/styles/modules/mpris.css | 11 --- waybar/styles/modules/network.css | 6 -- waybar/styles/modules/os.css | 9 -- waybar/styles/modules/swaync.css | 7 -- waybar/styles/modules/swww.css | 9 -- waybar/styles/modules/temperature.css | 6 -- waybar/styles/modules/tray.css | 22 ----- waybar/styles/modules/window.css | 15 ---- waybar/styles/modules/wireplumber.css | 7 -- waybar/styles/modules/workspaces.css | 30 ------- waybar/styles/waybar.css | 28 +++++++ 19 files changed, 128 insertions(+), 194 deletions(-) delete mode 100644 waybar/styles/module-groups.css delete mode 100644 waybar/styles/modules.css delete mode 100644 waybar/styles/modules/clock.css delete mode 100644 waybar/styles/modules/cpu.css delete mode 100644 waybar/styles/modules/idle.css delete mode 100644 waybar/styles/modules/memory.css delete mode 100644 waybar/styles/modules/mpris.css delete mode 100644 waybar/styles/modules/network.css delete mode 100644 waybar/styles/modules/os.css delete mode 100644 waybar/styles/modules/swaync.css delete mode 100644 waybar/styles/modules/swww.css delete mode 100644 waybar/styles/modules/temperature.css delete mode 100644 waybar/styles/modules/tray.css delete mode 100644 waybar/styles/modules/window.css delete mode 100644 waybar/styles/modules/wireplumber.css delete mode 100644 waybar/styles/modules/workspaces.css diff --git a/waybar/config.jsonc b/waybar/config.jsonc index 7cf95b6..9c686c0 100644 --- a/waybar/config.jsonc +++ b/waybar/config.jsonc @@ -73,18 +73,18 @@ "on-click": "", }, "cpu": { - "format": "󰻠 {usage}%", + "format": "󰻠 {usage}%", "tooltip": true, }, "memory": { - "format": "{}% 󰍛", + "format": " {}%", }, "temperature": { // "thermal-zone": 2, // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input", "critical-threshold": 80, // "format-critical": "{temperatureC}°C {icon}", - "format": "{icon} {temperatureC}°C", + "format": "{icon} {temperatureC}°C", "format-icons": ["", "", ""], }, "wireplumber": { @@ -95,7 +95,7 @@ "network": { // "interface": "wlp2*", // (Optional) To force the use of this interface "tooltip-format": "{essid}", - "format-wifi": " {signalStrength}%", + "format-wifi": " {signalStrength}%", "format-ethernet": "󰈀", "format-linked": "{ifname} (No IP) ", "format-disconnected": "󰖪", diff --git a/waybar/style.css b/waybar/style.css index 6eab198..403758e 100644 --- a/waybar/style.css +++ b/waybar/style.css @@ -14,30 +14,108 @@ } @define-color button @color1; -@define-color button-hover @color6; -@define-color button-active @color4; +@define-color button-hover @color3; +@define-color button-active @color2; /* * General */ -@import url("./styles/module-groups.css"); -@import url("./styles/modules.css"); @import url("./styles/waybar.css"); +/* + * Workspaces + */ +#workspaces { + border-radius: 9999px; + background: @button; +} + +#workspaces button { + padding: 0 9px 0 4px; + box-shadow: none; + border: none; + border-radius: 9999px; + color: @color7; + font-size: 24px; +} + +#workspaces button.active { + color: @button-active; +} + +#workspaces button:hover { + background: transparent; + color: @button-hover; +} + +#workspaces button.focused { + color: @button-active; +} + +#workspaces button.urgent { + color: #bf616a; +} + /* * Modules */ -@import url("./styles/modules/os.css"); -@import url("./styles/modules/clock.css"); -@import url("./styles/modules/cpu.css"); -@import url("./styles/modules/idle.css"); -@import url("./styles/modules/memory.css"); -@import url("./styles/modules/network.css"); -@import url("./styles/modules/mpris.css"); -@import url("./styles/modules/swaync.css"); -@import url("./styles/modules/swww.css"); -@import url("./styles/modules/temperature.css"); -@import url("./styles/modules/tray.css"); -@import url("./styles/modules/window.css"); -@import url("./styles/modules/wireplumber.css"); -@import url("./styles/modules/workspaces.css"); +#cpu, +#memory, +#network, +#temperature { + color: @color7; +} + +#clock, +#idle_inhibitor, +#mpris, +#custom-swaync, +#wireplumber, +#custom-swww, +#custom-os { + background: @button; +} + +#clock:hover, +#idle_inhibitor:hover, +#mpris:hover, +#custom-swaync:hover, +#wireplumber:hover, +#custom-swww:hover, +#custom-os:hover { + background: @button-hover; +} + +#idle_inhibitor.activated { + background-color: @button-active; +} + +#idle_inhibitor { + padding: 0 16px 0 12px; +} + +#mpris.spotify { + background-color: #1db954; +} + +#network.disconnected { + color: #f53c3c; +} + +#temperature.critical { + color: #bf616a; +} + +#wireplumber.muted { + color: #f53c3c; +} + +#custom-swww { + padding: 0 16px 0 8px; + font-size: 18px; +} + +#custom-os { + padding: 0 12px 0 6px; + font-size: 24px; +} diff --git a/waybar/styles/module-groups.css b/waybar/styles/module-groups.css deleted file mode 100644 index acfc00f..0000000 --- a/waybar/styles/module-groups.css +++ /dev/null @@ -1,14 +0,0 @@ -.modules-left { - padding: 0 3px; - margin-left: 10px; -} - -.modules-center { - padding: 0 3px; -} - -.modules-right { - padding: 0 3px; - margin-right: 10px; -} - diff --git a/waybar/styles/modules.css b/waybar/styles/modules.css deleted file mode 100644 index 278edf4..0000000 --- a/waybar/styles/modules.css +++ /dev/null @@ -1,13 +0,0 @@ -.module { - border-radius: 9999px; - margin: 8px 0; -} - -label.module { - padding: 0 10px; - /* box-shadow: inset 0 -2px; */ -} - -box.module { - padding: 0 10px; -} diff --git a/waybar/styles/modules/clock.css b/waybar/styles/modules/clock.css deleted file mode 100644 index d49fb49..0000000 --- a/waybar/styles/modules/clock.css +++ /dev/null @@ -1,7 +0,0 @@ -#clock { - background: @button; -} - -#clock:hover { - background: @button-hover; -} diff --git a/waybar/styles/modules/cpu.css b/waybar/styles/modules/cpu.css deleted file mode 100644 index ea24d51..0000000 --- a/waybar/styles/modules/cpu.css +++ /dev/null @@ -1,2 +0,0 @@ -#cpu { -} diff --git a/waybar/styles/modules/idle.css b/waybar/styles/modules/idle.css deleted file mode 100644 index fbe225b..0000000 --- a/waybar/styles/modules/idle.css +++ /dev/null @@ -1,12 +0,0 @@ -#idle_inhibitor { - padding: 0 16px 0 12px; - background-color: @button; -} - -#idle_inhibitor:hover { - background-color: @button-hover; -} - -#idle_inhibitor.activated { - background-color: @button-active; -} diff --git a/waybar/styles/modules/memory.css b/waybar/styles/modules/memory.css deleted file mode 100644 index 8427d7a..0000000 --- a/waybar/styles/modules/memory.css +++ /dev/null @@ -1,2 +0,0 @@ -#memory { -} diff --git a/waybar/styles/modules/mpris.css b/waybar/styles/modules/mpris.css deleted file mode 100644 index 0bb6c0c..0000000 --- a/waybar/styles/modules/mpris.css +++ /dev/null @@ -1,11 +0,0 @@ -#mpris { - background-color: @button; -} - -#mpris:hover { - background-color: @button-hover; -} - -#mpris.spotify { - background-color: #1db954; -} diff --git a/waybar/styles/modules/network.css b/waybar/styles/modules/network.css deleted file mode 100644 index 1bdaaa5..0000000 --- a/waybar/styles/modules/network.css +++ /dev/null @@ -1,6 +0,0 @@ -#network { -} - -#network.disconnected { - color: #f53c3c; -} diff --git a/waybar/styles/modules/os.css b/waybar/styles/modules/os.css deleted file mode 100644 index 51bbe4c..0000000 --- a/waybar/styles/modules/os.css +++ /dev/null @@ -1,9 +0,0 @@ -#custom-os { - padding: 0 12px 0 6px; - font-size: 24px; - background: @button; -} - -#custom-os:hover { - background: @button-hover; -} diff --git a/waybar/styles/modules/swaync.css b/waybar/styles/modules/swaync.css deleted file mode 100644 index 160ab12..0000000 --- a/waybar/styles/modules/swaync.css +++ /dev/null @@ -1,7 +0,0 @@ -#custom-swaync { - background-color: @button; -} - -#custom-swaync:hover { - background-color: @button-hover; -} diff --git a/waybar/styles/modules/swww.css b/waybar/styles/modules/swww.css deleted file mode 100644 index ca0d859..0000000 --- a/waybar/styles/modules/swww.css +++ /dev/null @@ -1,9 +0,0 @@ -#custom-swww { - padding: 0 16px 0 8px; - font-size: 18px; - background-color: @button; -} - -#custom-swww:hover { - background-color: @button-hover; -} diff --git a/waybar/styles/modules/temperature.css b/waybar/styles/modules/temperature.css deleted file mode 100644 index ac5e70f..0000000 --- a/waybar/styles/modules/temperature.css +++ /dev/null @@ -1,6 +0,0 @@ -#temperature { -} - -#temperature.critical { - color: #bf616a; -} diff --git a/waybar/styles/modules/tray.css b/waybar/styles/modules/tray.css deleted file mode 100644 index e19ae76..0000000 --- a/waybar/styles/modules/tray.css +++ /dev/null @@ -1,22 +0,0 @@ -#tray { - background-color: @button; - padding: 0 10px; -} - -#tray > .passive { - -gtk-icon-effect: dim; -} - -#tray > .needs-attention { - -gtk-icon-effect: highlight; - background-color: #eb4d4b; -} - -#tray button { - border-radius: 0px; - box-shadow: inset 0 -3px transparent; -} - -#tray button:hover { - box-shadow: inset 0 -3px #5e81ac; -} diff --git a/waybar/styles/modules/window.css b/waybar/styles/modules/window.css deleted file mode 100644 index 3849841..0000000 --- a/waybar/styles/modules/window.css +++ /dev/null @@ -1,15 +0,0 @@ -#window { - border-radius: 20px; - padding-left: 10px; - padding-right: 10px; -} - -window#waybar.kitty { - background-color: transparent; - color: #ffffff; -} - -/* make window module transparent when no windows present */ -window#waybar.empty #window { - background-color: transparent; -} diff --git a/waybar/styles/modules/wireplumber.css b/waybar/styles/modules/wireplumber.css deleted file mode 100644 index 925ab2d..0000000 --- a/waybar/styles/modules/wireplumber.css +++ /dev/null @@ -1,7 +0,0 @@ -#wireplumber { - background: @button; -} - -#wireplumber.muted { - color: #f53c3c; -} diff --git a/waybar/styles/modules/workspaces.css b/waybar/styles/modules/workspaces.css deleted file mode 100644 index 4fa823b..0000000 --- a/waybar/styles/modules/workspaces.css +++ /dev/null @@ -1,30 +0,0 @@ -#workspaces { - padding: 0; - /* border: 2px solid @color4; */ -} - -#workspaces button { - padding: 0 9px 0 4px; - box-shadow: none; - border: none; - border-radius: 9999px; - color: @button; - font-size: 24px; -} - -#workspaces button.active { - color: @button-active; -} - -#workspaces button:hover { - background: transparent; - color: @button-hover; -} - -#workspaces button.focused { - color: @button-active; -} - -#workspaces button.urgent { - color: #bf616a; -} diff --git a/waybar/styles/waybar.css b/waybar/styles/waybar.css index 56acc5a..e99b62c 100644 --- a/waybar/styles/waybar.css +++ b/waybar/styles/waybar.css @@ -21,3 +21,31 @@ window#waybar.hidden { opacity: 1; } } + +.module { + border-radius: 9999px; + margin: 8px 0; +} + +label.module { + padding: 0 10px; + /* box-shadow: inset 0 -2px; */ +} + +box.module { + padding: 0 10px; +} + +.modules-left { + padding: 0 3px; + margin-left: 10px; +} + +.modules-center { + padding: 0 3px; +} + +.modules-right { + padding: 0 3px; + margin-right: 10px; +}