From: Andre Ramnitz Date: Thu, 15 Aug 2024 23:25:14 +0000 (+0200) Subject: waybar: more subtle colors, smooth everything out X-Git-Tag: v0.2~137 X-Git-Url: https://git.ramnitz.eu/?a=commitdiff_plain;h=cc066758d7507a650b16699cd46580c79a7c0354;p=dotfiles.git waybar: more subtle colors, smooth everything out --- diff --git a/config/waybar/config.jsonc b/config/waybar/config.jsonc index 99a16f64..d101201a 100644 --- a/config/waybar/config.jsonc +++ b/config/waybar/config.jsonc @@ -1,292 +1,365 @@ //# kak: filetype=json:ts=2:iw=2 { - "layer": "top", // Waybar at top layer - "position": "top", // Waybar position (top|bottom|left|right) - "width": 3440, // Waybar width - "height": 32, // Waybar height, leave blank for auto - "spacing": 1, // Gaps between modules (4px) - "modules-left": ["hyprland/window", "hyprland/submap"], - "modules-center": ["custom/spacer", "hyprland/workspaces", "mpd"], - "modules-right": [ - "tray", - "pulseaudio", - "mpd#volume", - "cpu", - "memory", - "group/temps", - "group/gammarelay", - "clock", - "group/system", - ], + "layer": "top", // Waybar at top layer + "position": "top", // Waybar position (top|bottom|left|right) + //"width": 3440, // Waybar width + "height": 33, // Waybar height, leave blank for auto + "spacing": 1, // Gaps between modules (4px) + "modules-left": ["custom/launcher", "hyprland/workspaces", "mpd"], + "modules-center": ["hyprland/window"], + "modules-right": [ + "tray", + "custom/notification", + "cpu", + "memory", + "group/temps", + "group/gammarelay", + "group/system", + "pulseaudio", + "clock", + ], - // Modules configuration + // Modules configuration + // "format": "", - "hyprland/workspaces": { - "format": "{icon}", - "format-icons": { - "1": "1", - "2": "2", - "3": "3", - "4": "4", - "5": "5", - "6": "6", - "7": "7", - "8": "8", - "9": "9", - "0": "0", - // "urgent": "", - // "active": "", - // "default": "", - }, - "persistent-workspaces": { - "*": 6, - }, - "sort-by-number": true, - }, + "custom/launcher": { + "format": "󰀻", + "on-click": "killall fuzzel || fuzzel --config=$HOME/.config/fuzzel/fuzzel-startmenu.ini", + "on-click-right": "$HOME/.local/bin/reloadwb.sh", + "tooltip": false, + }, - "hyprland/window": { - "format": "{title}", - "rewrite-default": "👉 {title}", - "rewrite": { - "(.*) – Mozilla Firefox": " $1", - "(.*) - Kakoune": " $1", - "(.*) - Dolphin": " $1", - "lfrun(.*)": "󰀶 $1", - "NCMPCPP(.*)": "󰲹 $1", - "Threema(.*)": "󰭺 $1", - }, - "on-click": "hyprctl dispatch pseudo", - "on-click-right": "~/.config/hypr/scripts/mousefocus_toggle.sh", - "separate-outputs": true, + "hyprland/workspaces": { + "format": "{icon}", + "format-icons": { + "1": "1", + "2": "2", + "3": "3", + "4": "4", + "5": "5", + "6": "6", + "7": "7", + "8": "8", + "9": "9", + "0": "0", + // "urgent": "", + // "active": "", + // "default": "", }, - - "keyboard-state": { - "numlock": true, - "capslock": true, - "format": "{icon} {name}", - "format-icons": { - "locked": " ", - "unlocked": " ", - }, + "persistent-workspaces": { + "*": 6, }, + "sort-by-number": true, + }, - "mpd": { - //"format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}⸨{songPosition}|{queueLength}⸩ {artist} - {title} ({elapsedTime:%M:%S}|{totalTime:%M:%S}) {volume}% ", - "format": " {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}⸨{songPosition}|{queueLength}⸩ {title} {stateIcon}", - "format-disconnected": "", - "format-stopped": "", - "unknown-tag": "N/A", - "interval": 2, - "max-length": 30, - "consume-icons": { - "on": " ", - }, - "random-icons": { - //"off": " ", - "off": "", - "on": " ", - }, - "repeat-icons": { - "on": " ", - }, - "single-icons": { - "on": "1 ", - }, - "state-icons": { - "paused": "", - "playing": "", - }, - "tooltip-format": "{artist} - {album} - {title} | {volume}%", - "tooltip-format-disconnected": "mpd disconnected!", - "on-click": "mpc toggle", - "on-click-middle": "mpc next", - "on-click-right": "mpc prev", + "hyprland/window": { + "format": "{title}", + "rewrite-default": "👉 {title}", + "rewrite": { + "(.*) – Mozilla Firefox": " $1", + "(.*) - qutebrowser": " $1", + "(.*) - Kakoune": " $1", + "(.*) - Dolphin": " $1", + "lfrun(.*)": "󰀶 $1", + "NCMPCPP(.*)": "󰲹 $1", + "Threema(.*)": "󰭺 $1", }, + "on-click": "hyprctl dispatch pseudo", + "on-click-right": "~/.config/hypr/scripts/mousefocus_toggle.sh", + "separate-outputs": true, + }, - "mpd#volume": { - "format": " {volume}%", - "format-disconnected": " --%", - "format-stopped": " --%", - "on-click": "mpc volume 70", - "on-click-right": "mpc volume 100", - "on-scroll-up": "mpc volume +5 > /dev/null 2>&1", - "on-scroll-down": "mpc volume -5 > /dev/null 2>&1", + "keyboard-state": { + "numlock": true, + "capslock": true, + "format": "{icon} {name}", + "format-icons": { + "locked": " ", + "unlocked": " ", }, + }, - "tray": { - "icon-size": 26, - "spacing": 10, + "mpd": { + "format": "mpd: {stateIcon} {artist} - {album} - {title} ⸨{songPosition}|{queueLength}⸩ {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}", + "format-disconnected": "", + "format-stopped": "", + "unknown-tag": "N/A", + "interval": 2, + "consume-icons": { + "on": " ", }, - - "cpu": { - "format": "{usage:3}%", - "on-click": "/usr/bin/foot -a popup htop", - "interval": 2, + "random-icons": { + //"off": " ", + "off": "", + "on": " ", }, - - "memory": { - "format": "{percentage:3}%", - "on-click": "/usr/bin/foot -a popup htop", - "interval": 2, + "repeat-icons": { + "on": " ", }, - - "temperature": { - "hwmon-path": "/sys/class/hwmon/hwmon4/temp6_input", - "critical-threshold": 42, - "format": "{icon}H2O:{temperatureC}°C", - "format-icons": ["", "", ""], + "single-icons": { + "on": "1 ", }, - - "temperature#cpu": { - "hwmon-path": "/sys/class/hwmon/hwmon3/temp1_input", - "critical-threshold": 75, - "format": "{icon}CPU:{temperatureC}°C", - "format-icons": ["", "", ""], + "state-icons": { + "paused": "", + "playing": "", }, + "tooltip-format": "{artist} - {album} - {title} | {volume}%", + "tooltip-format-disconnected": "mpd disconnected!", + "on-click": "mpc toggle", + "on-click-backward": "mpc stop && playerctld unshift", + "on-click-middle": "mpc next", + "on-click-right": "mpc prev", + }, - "temperature#chipset": { - "hwmon-path": "/sys/class/hwmon/hwmon4/temp5_input", - "critical-threshold": 75, - "format": "{icon}Chipset:{temperatureC}°C", - "format-icons": ["", "", ""], + "mpris": { + "format": "{player}: {player_icon} {dynamic}", + "format-paused": "{status_icon} {dynamic}", + "format-stopped": "{status_icon}", + "dynamic-importance-order": [ + "artist", + "album", + "title", + "position", + "length", + ], + "player-icons": { + "default": "▶", + "mpv": "▶", }, - - "temperature#vrm": { - "hwmon-path": "/sys/class/hwmon/hwmon4/temp9_input", - "critical-threshold": 95, - "format": "{icon}VRM:{temperatureC}°C", - "format-icons": ["", "", ""], + "status-icons": { + "paused": "⏸", + "stopped": "", }, + "ignored-players": ["firefox", "mpd"], + }, - "temperature#gpu": { - "hwmon-path": "/sys/class/drm/card0/device/hwmon/hwmon0/temp2_input", - "critical-threshold": 110, - "format": "{icon}GPU:{temperatureC}°C", - "format-icons": ["", "", ""], - }, + "mpd#volume": { + "format": "{volume} 󱄠", + "format-disconnected": "--- 󱄠", + "format-stopped": "--- 󱄠", + "on-click": "mpc volume 70 > /dev/null 2>&1", + "on-click-right": "mpc volume 100 > /dev/null 2>&1", + "on-scroll-up": "mpc volume +5 > /dev/null 2>&1", + "on-scroll-down": "mpc volume -5 > /dev/null 2>&1", + }, - "network": { - // "interface": "wlp2*", // (Optional) To force the use of this interface - "format-wifi": "{essid} ({signalStrength}%) ", - "format-ethernet": "{ipaddr}/{cidr} ", - "tooltip-format": "{ifname} via {gwaddr} ", - "format-linked": "{ifname} (No IP) ", - "format-disconnected": "Disconnected ⚠", - "format-alt": "{ifname}: {ipaddr}/{cidr}", - }, + "tray": { + "icon-size": 16, + "spacing": 8, + }, - "pulseaudio": { - "scroll-step": 5, // %, can be a float - "format": "{icon} {volume}% {format_source}", - "format-bluetooth": "{icon} {volume}% {format_source}", - "format-bluetooth-muted": " {icon} {format_source}", - "format-muted": " {format_source}", - "format-source": " {volume}%", - "format-source-muted": "", - "format-icons": { - "headphone": "", - "hands-free": "", - "headset": "", - "phone": "", - "portable": "", - "car": "", - "default": ["", "", ""], - }, - "on-click": "pavucontrol", - }, + "cpu": { + "format": "{usage:2} 󰍛", + "on-click": "/usr/bin/foot -a popup htop", + "interval": 1, + }, - "clock": { - "timezone": "Europe/Berlin", - "tooltip-format": "{:%Y %B}\n{calendar}", - "format-alt": "{:%Y-%m-%d}", - }, + "memory": { + "format": "{percentage:2} 󰳿", + "on-click": "/usr/bin/foot -a popup htop", + "interval": 1, + }, - "idle_inhibitor": { - "format": " {icon} ", - "format-icons": { - "activated": "", - "deactivated": "", - }, - }, + "temperature": { + "hwmon-path": "/sys/class/hwmon/hwmon4/temp6_input", + "critical-threshold": 42, + "format": ":{temperatureC}°C {icon}", + "format-icons": ["", "", ""], + }, - "custom/wallpaper": { - "format": "  ", - "on-click": "$HOME/.local/bin/rndwallpaper swww", - "tooltip": false, - "interval": "once", - }, + "temperature#cpu": { + "hwmon-path": "/sys/class/hwmon/hwmon3/temp1_input", + "critical-threshold": 75, + "format": "CPU:{temperatureC}°C ", + "format-icons": ["", "", ""], + }, - "custom/powermenu": { - "format": " ⏻ ", - "on-click": "$HOME/.config/hypr/scripts/powermenu.sh", - "tooltip": false, - "interval": "once", - }, + "temperature#chipset": { + "hwmon-path": "/sys/class/hwmon/hwmon4/temp5_input", + "critical-threshold": 75, + "format": "Chipset:{temperatureC}°C ", + "format-icons": ["", "", ""], + }, + + "temperature#vrm": { + "hwmon-path": "/sys/class/hwmon/hwmon4/temp9_input", + "critical-threshold": 95, + "format": "VRM:{temperatureC}°C ", + "format-icons": ["", "", ""], + }, + + "temperature#gpu": { + "hwmon-path": "/sys/class/drm/card0/device/hwmon/hwmon0/temp2_input", + "critical-threshold": 110, + "format": "GPU:{temperatureC}°C ", + "format-icons": ["", "", ""], + }, - "custom/spacer": { - "format": " ", - "max-length": 30, - "tooltip": false, + "network": { + "interface": "wlan0*", // (Optional) To force the use of this interface + "format-wifi": " {essid} ({signalStrength}%)", + "format-ethernet": "{ipaddr}/{cidr} ", + "tooltip-format": "{ifname} via {gwaddr} ", + "format-linked": "{ifname} (No IP) ", + "format-disconnected": "⚠ ", + "format-alt": "{ifname}: {ipaddr}/{cidr}", + }, + + "pulseaudio": { + "scroll-step": 5, // %, can be a float + "format": "{volume} {icon} {format_source}", + "format-bluetooth": "{icon} {volume}% {format_source}", + "format-bluetooth-muted": " {icon} {format_source}", + "format-muted": " {format_source}", + "format-source": "{volume} ", + "format-source-muted": "", + "format-icons": { + "headphone": "", + "hands-free": "", + "headset": "", + "phone": "", + "portable": "", + "car": "", + "default": ["", "", ""], }, + "on-click": "pavucontrol", + }, - "custom/gammarelay-temperature": { - "format": " {}", - "exec": "wl-gammarelay-rs watch {t}", - "on-scroll-up": "busctl --user -- call rs.wl-gammarelay / rs.wl.gammarelay UpdateTemperature n +100", - "on-scroll-down": "busctl --user -- call rs.wl-gammarelay / rs.wl.gammarelay UpdateTemperature n -100", - "interval": "2", + "clock": { + "timezone": "Europe/Berlin", + "tooltip-format": "{:%Y %B}\n{calendar}", + "format-alt": "{:%Y-%m-%d}", + "smooth-scrolling-threshold": "single", + "calendar": { + "mode": "month", + "mode-mon-col": 1, + "weeks-pos": "left", + "on-scroll": 1, + "format": { + "months": "{}", + "days": "{}", + "weeks": "W{}", + "weekdays": "{}", + "today": "{}", + }, + }, + "actions": { + "on-click-right": "mode", + "on-scroll-up": "shift_down", + "on-scroll-down": "shift_up", }, - "custom/gammarelay-brightness": { - "format": " {}%", - "exec": "wl-gammarelay-rs watch {bp}", - "on-scroll-up": "busctl --user -- call rs.wl-gammarelay / rs.wl.gammarelay UpdateBrightness d +0.02", - "on-scroll-down": "busctl --user -- call rs.wl-gammarelay / rs.wl.gammarelay UpdateBrightness d -0.02", - "interval": "2", + }, + + "custom/notification": { + "tooltip": false, + "format": "{icon}", + "format-icons": { + "notification": "", + "none": "  ", + "dnd-notification": "", + "dnd-none": "  ", + "inhibited-notification": "", + "inhibited-none": "  ", + "dnd-inhibited-notification": "", + "dnd-inhibited-none": "  ", }, - "custom/gammarelay-gamma": { - "format": "𝛄 {}%", - "exec": "wl-gammarelay-rs watch {g}", - "on-scroll-up": "busctl --user -- call rs.wl-gammarelay / rs.wl.gammarelay UpdateGamma d +0.02", - "on-scroll-down": "busctl --user -- call rs.wl-gammarelay / rs.wl.gammarelay UpdateGamma d -0.02", - "interval": "2", + "return-type": "json", + "exec-if": "pidof swaync-client", + "exec": "swaync-client -swb", + "on-click": "swaync-client -t -sw", + "on-click-right": "swaync-client -d -sw", + "escape": true, + }, + + "idle_inhibitor": { + "format": " {icon} ", + "format-icons": { + "activated": "", + "deactivated": "", }, - "group/system": { - "orientation": "inherit", - "drawer": { - "transition-duration": 500, - "children-class": "not-system", - "transition-left-to-right": false, - }, - "modules": ["custom/powermenu", "idle_inhibitor", "custom/wallpaper"], + }, + + "custom/wallpaper": { + "format": "  ", + "on-click": "$HOME/.local/bin/rndwallpaper swww", + "tooltip": false, + "interval": "once", + }, + + // "custom/powermenu": { + // "format": " ⏻ ", + // "on-click": "killall fuzzel || $HOME/.config/hypr/scripts/powermenu.sh", + // "tooltip": false, + // "interval": "once", + // }, + + "custom/spacer": { + "format": " ", + "max-length": 30, + "tooltip": false, + }, + + "custom/gammarelay-temperature": { + "format": "{} ", + "exec": "wl-gammarelay-rs watch {t}", + "on-scroll-up": "busctl --user -- call rs.wl-gammarelay / rs.wl.gammarelay UpdateTemperature n +100", + "on-scroll-down": "busctl --user -- call rs.wl-gammarelay / rs.wl.gammarelay UpdateTemperature n -100", + "on-click": "busctl --user -- set-property rs.wl-gammarelay / rs.wl.gammarelay Temperature q 6500", + "on-click-right": "test -f /tmp/autotemp.pid && kill $(cat /tmp/autotemp.pid) &", + "on-click-middle": "${HOME}/.config/hypr/scripts/gammarelay-autotemp.py > /dev/null 2>&1 &", + "interval": "2", + }, + "custom/gammarelay-brightness": { + "format": "{}% ", + "exec": "wl-gammarelay-rs watch {bp}", + "on-scroll-up": "busctl --user -- call rs.wl-gammarelay / rs.wl.gammarelay UpdateBrightness d +0.02", + "on-scroll-down": "busctl --user -- call rs.wl-gammarelay / rs.wl.gammarelay UpdateBrightness d -0.02", + "interval": "2", + }, + "custom/gammarelay-gamma": { + "format": "{} 𝛄", + "exec": "wl-gammarelay-rs watch {g}", + "on-scroll-up": "busctl --user -- call rs.wl-gammarelay / rs.wl.gammarelay UpdateGamma d +0.02", + "on-scroll-down": "busctl --user -- call rs.wl-gammarelay / rs.wl.gammarelay UpdateGamma d -0.02", + "interval": "2", + }, + "group/system": { + "orientation": "inherit", + "drawer": { + "transition-duration": 500, + "children-class": "not-system", + "transition-left-to-right": false, }, + "modules": ["custom/powermenu", "idle_inhibitor", "custom/wallpaper"], + }, - "group/gammarelay": { - "orientation": "inherit", - "drawer": { - "transition-duration": 500, - "children-class": "not-gammarelay", - "transition-left-to-right": false, - }, - "modules": [ - "custom/gammarelay-temperature", - "custom/gammarelay-gamma", - "custom/gammarelay-brightness", - ], + "group/gammarelay": { + "orientation": "inherit", + "drawer": { + "transition-duration": 500, + "children-class": "not-gammarelay", + "transition-left-to-right": false, }, + "modules": [ + "custom/gammarelay-temperature", + "custom/gammarelay-gamma", + "custom/gammarelay-brightness", + ], + }, - "group/temps": { - "orientation": "inherit", - "drawer": { - "transition-duration": 500, - "children-class": "not-temps", - "transition-left-to-right": false, - }, - "modules": [ - "temperature", - "temperature#cpu", - "temperature#chipset", - "temperature#vrm", - "temperature#gpu", - ], + "group/temps": { + "orientation": "inherit", + "drawer": { + "transition-duration": 750, + "children-class": "not-temps", + "transition-left-to-right": false, }, + "modules": [ + "temperature", + "temperature#cpu", + "temperature#chipset", + "temperature#vrm", + "temperature#gpu", + ], + }, } diff --git a/config/waybar/style.css b/config/waybar/style.css index 95e45119..9bc02158 100644 --- a/config/waybar/style.css +++ b/config/waybar/style.css @@ -1,147 +1,272 @@ -/* ----------------------------------- window ----------------------------------- */ -@define-color white #F2F2F2; -@define-color black #000203; -@define-color text #BECBCB; -@define-color lightgray rgba(32,32,32,0.9); -@define-color border rgb(72,78,82); -@define-color darkgray rgba(24,24,24,0.9); -@define-color lightblue rgba(35,148,204,0.45); -@define-color yellow2 rgba(228,169,68, 0.9); -@define-color green2 rgba(124,184,143,0.45); - -@define-color red rgba(228, 89,68,0.9); -@define-color yellow rgba(228,169,68,0.8); -@define-color blue rgba(68,143,228,0.9); -@define-color green rgba(68,228,153,0.8); -@define-color purple rgba(111,68,228,0.9); -@define-color orange rgba(228,129,68,0.9); - -@define-color bt1 rgba(0, 0, 0, 0.1); -@define-color bt2 rgba(0, 0, 0, 0.2); -@define-color bt3 rgba(0, 0, 0, 0.3); -@define-color bt4 rgba(0, 0, 0, 0.4); -@define-color bt5 rgba(0, 0, 0, 0.5); -@define-color bt6 rgba(0, 0, 0, 0.6); -@define-color bt7 rgba(0, 0, 0, 0.7); -@define-color bt8 rgba(0, 0, 0, 0.8); -@define-color bt9 rgba(0, 0, 0, 0.9); -@define-color bs rgba(0, 0, 0, 1.0); - -@define-color wt1 rgba(232,232,232,0.1); -@define-color wt2 rgba(232,232,232,0.2); -@define-color wt3 rgba(232,232,232,0.3); -@define-color wt4 rgba(232,232,232,0.4); -@define-color wt5 rgba(232,232,232,0.5); -@define-color wt6 rgba(232,232,232,0.6); -@define-color wt7 rgba(232,232,232,0.7); -@define-color wt8 rgba(232,232,232,0.8); -@define-color wt9 rgba(232,232,232,0.9); -@define-color ws rgba(232,232,232,1.0); +/* ----------------------------------- import ----------------------------------- */ +@import "../colors/colorscheme.css"; +/* ----------------------------------- window ----------------------------------- */ * { - font-family: "BlexMono Nerd Font"; - font-size: 11pt; - min-height: 0px; - font-weight: 500; - padding: 0; - margin: 0; + font-family: "Iosevka Nerd Font Propo"; + font-size: 13pt; + min-height: 0px; + font-weight: 500; + font-stretch: expanded; + padding: 0; + margin: 0; } /* ----------------------------------- waybar ----------------------------------- */ #waybar { - /*background: @bt8;*/ - border-radius: 1px; - border-top: 1px @bs; - border-bottom: 1px @border; - border-left: 1px @border; - border-right: 1px @border; - color: @ws; + border-radius: 2px; + border-top: 1px @border; + border-bottom: 1px @border; + border-left: 1px @border; + border-right: 1px @border; + color: @ws; +} + +#waybar>box { + padding-left: 12px; + padding-right: 12px; } -/* ---------------------------------- tooltip ---------------------------------- */ + tooltip { - background: @bs; - border: 1px @border; - border-radius: 0; + background: @bs; + border: 1px @border; + border-radius: 0; } tooltip label { - color: @text; + color: @text; } -/* ----------------------------------- window ----------------------------------- */ -#window { - padding: 0 8px; - margin: 0 4px; +/* ------------------------------------ modules left ------------------------------- */ +#custom-launcher { + border-radius: 8px; + padding-left: 10px; + padding-right: 10px; + margin-top: 5px; + margin-left: 1px; + margin-right: 1px; + margin-bottom: 7px; + color: @bs; + background: @yellow; + border: 1px solid alpha(@border, 0.5); + font-size: 14pt; } -window#waybar.empty #window { - background-color: transparent; +#workspaces { + border-radius: 8px; + padding-left: 12px; + padding-right: 12px; + margin-top: 5px; + margin-left: 1px; + margin-right: 1px; + margin-bottom: 7px; + background-color: alpha(@ral9023,0.3); + font-size: 13pt; } -window#waybar { - background-color: rgba(59, 64, 69, 1); - border-bottom: 1px solid rgba(100, 114, 125, 1); - color: @wt9; - transition-property: background-color; - transition-duration: 0.5s; +#workspaces button { + border-radius: 8px; + background: @ral9023; + color: @bt5; + border: 0px solid @ral9022; + padding-left: 8px; + padding-right: 8px; + margin-top: 5px; + margin-left: 1px; + margin-right: 1px; + margin-bottom: 7px; + transition: all 0.3s ease; + font-weight: 500; } -window#waybar.hidden { - opacity: 0.2; + +#workspaces button:hover { + border-radius: 8px; + box-shadow: inherit; + text-shadow: inherit; + color: @bs; + opacity: 0.8; + background: @orange; + border: 0px solid @ral9022; + transition: all 0.3s ease; } -window#waybar.empty { - background-color: transparent; - background-image: linear-gradient( - 180deg, - rgba(42, 46, 50, 1), - rgba(42, 46, 50, 0.7), - rgba(22, 24, 30, 0) - ); - border-bottom: 1px solid rgba(100, 114, 125, 0); + +#workspaces button.focused, +#workspaces button.active { + border-radius: 8px; + background: @orange; + border: 0px solid @ral9022; + color: @bs; + transition: all 0.3s ease; + animation: colored-gradient 10s ease infinite; } -window#waybar.foot { - background-color: rgba(62, 79, 95, 1); + +#workspaces button.urgent { + border-radius: 8px; + background: @red; + border: 0px solid @ral9022; + color: @bs; + transition: all 0.3s ease; } -/* ---------------------------------- workspaces ---------------------------------- */ -#workspaces { - padding: 0 8px; - margin: 4px; +#mpd { + border-radius: 8px; + padding-left: 8px; + padding-right: 8px; + margin-top: 5px; + margin-left: 0px; + margin-right: 0px; + margin-bottom: 7px; + color: @ws; + background-color: alpha(@cyan, 0.3); + border: 1px solid alpha(@border, 0.5); } -#workspaces button { - background-color: transparent; - color: @wt4; - transition: all 0.3s ease; +#mpris { + border-radius: 8px; + padding-left: 8px; + padding-right: 8px; + margin-top: 5px; + margin-left: 0px; + margin-right: 0px; + margin-bottom: 7px; + color: @ws; + background-color: alpha(@ral9023, 0.3); + border: 1px solid alpha(@border, 0.5); } -#workspaces button:hover { - box-shadow: inherit; - text-shadow: inherit; - background: transparent; - border: 1px solid rgba(0, 0, 0, 0); - color: @wt8; - transition: all 0.3s ease; +/* ------------------------------------ modules center ----------------------------- */ +#window { + border-radius: 8px; + padding-left: 8px; + padding-right: 8px; + margin-top: 5px; + margin-left: 0px; + margin-right: 0px; + margin-bottom: 7px; + color: @ws; + background-color: alpha(@ral9023, 0.3); + border: 1px solid alpha(@border, 0.5); } -#workspaces button.focused, -#workspaces button.active { - color: @red; - transition: all 0.3s ease; - animation: colored-gradient 10s ease infinite; +window#waybar { + border-left: 1px solid @ral9023; + border-right: 1px solid @ral9023; + border-bottom: 1px solid @ral9023; + color: @wt9; + background-color: @ral9017; + transition-property: background-color; + transition-duration: 0.5s; + background-image: url("/home/andy/dotfiles/config/waybar/textures/D.png"); + background-position: topleft; + background-repeat: repeat-x; } -#workspaces button.urgent { - background-color: @red; - color: @bs; - transition: all 0.3s ease; +window#waybar.footclient { + background: rgba(36, 36, 36, 0.95); + border-left: 1px transparent; + border-right: 1px transparent; + border-bottom: 1px transparent; +} + +window#waybar.empty { + border-left: 1px transparent; + border-right: 1px transparent; + border-bottom: 1px transparent; } -/* ------------------------------------ modules ------------------------------------ */ -#cpu, +/* ------------------------------------ modules right ------------------------------ */ +#tray { + border-radius: 8px; + padding-left: 8px; + padding-right: 8px; + margin-top: 5px; + margin-left: 0px; + margin-right: 0px; + margin-bottom: 7px; + color: @ws; + background-color: alpha(@ral9023,0.3); + border: 1px solid alpha(@border, 0.5); +} + +#pulseaudio { + border-radius: 8px; + padding-left: 8px; + padding-right: 8px; + margin-top: 5px; + margin-left: 0px; + margin-right: 0px; + margin-bottom: 7px; + color: @ws; + background-color: alpha(@yellow, 0.3); + border: 1px solid alpha(@border, 0.5); + font-weight: 600; + font-size: 13pt; +} + +#mpd#volume { + border-radius: 8px; + padding-left: 0px; + color: @wt8; + background: @ral9017; + padding-right: 4px; +} + +#cpu { + border-radius: 8px; + padding-left: 8px; + padding-right: 8px; + margin-top: 5px; + margin-left: 0px; + margin-right: 0px; + margin-bottom: 7px; + color: @ws; + background-color: alpha(@blue, 0.3); + border: 1px solid alpha(@border, 0.5); + font-weight: 600; + font-size: 13pt; +} #memory { - padding: 0 8px; - color: @wt8; - border-bottom: 1px @border; + border-radius: 8px; + padding-left: 8px; + padding-right: 8px; + margin-top: 5px; + margin-left: 0px; + margin-right: 0px; + margin-bottom: 7px; + color: @ws; + background-color: alpha(@cyan, 0.3); + border: 1px solid alpha(@border, 0.5); + font-weight: 600; + font-size: 13pt; +} + +#clock { + border-radius: 8px; + padding-left: 8px; + padding-right: 8px; + margin-top: 5px; + margin-left: 0px; + margin-right: 0px; + margin-bottom: 7px; + color: @ws; + background-color: alpha(@ral9023, 0.3); + border: 1px solid alpha(@border, 0.5); + font-weight: 600; + font-size: 13pt; +} + +#custom-notification { + border-radius: 8px; + padding-left: 8px; + padding-right: 8px; + margin-top: 5px; + margin-left: 0px; + margin-right: 0px; + margin-bottom: 7px; + color: @ws; + background-color: alpha(@purple, 0.3); + border: 1px solid alpha(@border, 0.5); + font-size: 13pt; } #temperature, @@ -149,10 +274,16 @@ window#waybar.foot { #temperature#chipset, #temperature#vrm, #temperature#gpu { - padding: 0 8px; - color: @bt8; - background-color: @orange; - border-bottom: 1px @border; + border-radius: 8px; + padding-left: 8px; + padding-right: 8px; + margin-top: 5px; + margin-left: 0px; + margin-right: 0px; + margin-bottom: 7px; + color: @ws; + background-color: alpha(@orange, 0.3); + border: 1px solid alpha(@border, 0.5); } #temperature.critical, @@ -160,74 +291,56 @@ window#waybar.foot { #temperature#chipset.critical, #temperature#vrm.critical, #temperature#gpu.critical { - padding: 0 8px; - color: @bt8; - background-color: @red; - border-bottom: 1px @border; -} - -#pulseaudio { - padding: 0 8px; - color: @wt8; - border-bottom: 1px @border; -} - -#mpd { - padding: 4px; - margin: 0 4px; - color: #eff0f1; - min-height: 0px; -} -#mpd#volume { - padding: 4px; - margin: 0 9px; -} - -#custom-spacer { - /* padding: 0 0px;*/ - /* margin: 0 1px;*/ -} - -#tray { - padding: 0 8px; - margin: 0 8px; - color: @ws; - border-bottom: 1px @border; + border-radius: 8px; + padding-left: 8px; + padding-right: 8px; + margin-top: 5px; + margin-left: 0px; + margin-right: 0px; + margin-bottom: 7px; + color: @ws; + background-color: alpha(@green, 0.3); + border: 1px solid alpha(@border, 0.5); } #custom-gammarelay-temperature, #custom-gammarelay-gamma, #custom-gammarelay-brightness { - padding: 0 8px; - color: @bt7; - background-color: @blue; - border-bottom: 1px @border; -} - -#clock { - padding: 0 8px; - color: @bt7; - background-color: @green; - border-bottom: 1px @border; -} - -#idle_inhibitor { - padding: 0 4px; - color: @bs; - background-color: @yellow; - border-bottom: 1px @border; + border-radius: 8px; + padding-left: 8px; + padding-right: 8px; + margin-top: 5px; + margin-left: 0px; + margin-right: 0px; + margin-bottom: 7px; + color: @ws; + background-color: alpha(@orange, 0.3); + border: 1px solid alpha(@border, 0.5); } +#idle_inhibitor, #custom-wallpaper { - padding: 0 4px; - color: @bs; - background-color: @yellow; - border-bottom: 1px @border; + border-radius: 8px; + padding-left: 8px; + padding-right: 8px; + margin-top: 5px; + margin-left: 0px; + margin-right: 0px; + margin-bottom: 7px; + color: @ws; + background-color: alpha(@yellow, 0.3); + border: 1px solid alpha(@border, 0.5); } #custom-powermenu { - padding: 0 4px; - color: @bs; - background-color: @yellow; - border-bottom: 1px @border; + border-radius: 8px; + padding-left: 8px; + padding-right: 8px; + margin-top: 5px; + margin-left: 0px; + margin-right: 0px; + margin-bottom: 7px; + color: @ws; + background-color: alpha(@yellow, 0.3); + border: 1px solid alpha(@border, 0.5); } diff --git a/config/waybar/textures/A.png b/config/waybar/textures/A.png new file mode 100644 index 00000000..d94be161 Binary files /dev/null and b/config/waybar/textures/A.png differ diff --git a/config/waybar/textures/B.png b/config/waybar/textures/B.png new file mode 100644 index 00000000..4b1beb5d Binary files /dev/null and b/config/waybar/textures/B.png differ diff --git a/config/waybar/textures/C.png b/config/waybar/textures/C.png new file mode 100644 index 00000000..41f1633c Binary files /dev/null and b/config/waybar/textures/C.png differ diff --git a/config/waybar/textures/D.png b/config/waybar/textures/D.png new file mode 100644 index 00000000..34af7122 Binary files /dev/null and b/config/waybar/textures/D.png differ diff --git a/local/bin/reloadwb.sh b/local/bin/reloadwb.sh new file mode 100755 index 00000000..2c6095a9 --- /dev/null +++ b/local/bin/reloadwb.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +main() { + local CONFIG="$HOME/.config/waybar/config.jsonc" + local STYLE="$HOME/.config//waybar/style.css" + + if [ $(pidof waybar) ]; + then + kill -SIGUSR2 $(pidof waybar) + else + waybar -c "$CONFIG" -s "$STYLE" > /dev/null 2>&1 & + fi +} +main + diff --git a/local/bin/waybar_reload.sh b/local/bin/waybar_reload.sh deleted file mode 100755 index cf8aba4e..00000000 --- a/local/bin/waybar_reload.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -main() { - local CONFIG="$HOME/.config/waybar/config" - local STYLE="$HOME/.config//waybar/style.css" - - if [ $(pidof waybar) ]; - then - killall waybar - waybar -c "$CONFIG" -s "$STYLE" > /dev/null 2>&1 & - else - waybar -c "$CONFIG" -s "$STYLE" > /dev/null 2>&1 & - fi -} -main -