From b73a62c3bc08edaf396956d52d07bd9220cc09a8 Mon Sep 17 00:00:00 2001 From: Andre Ramnitz Date: Sun, 11 Aug 2024 23:51:33 +0200 Subject: [PATCH] hypr/waybar: complete overhaul for hyprland 0.42.0 --- config/hypr/hyprland.conf | 16 +- config/hypr/scripts/gammarelay-autotemp.py | 4 +- config/hypr/scripts/mousefocus_toggle.sh | 7 + config/hypr/scripts/startup.sh | 6 +- config/waybar/config | 236 -------------- config/waybar/config.jsonc | 292 ++++++++++++++++++ .../{oldstyle.css => laststyle-20231214.css} | 0 config/waybar/laststyle-20240811.css | 150 +++++++++ config/waybar/style.css | 258 +++++++++++----- 9 files changed, 638 insertions(+), 331 deletions(-) create mode 100755 config/hypr/scripts/mousefocus_toggle.sh delete mode 100644 config/waybar/config create mode 100644 config/waybar/config.jsonc rename config/waybar/{oldstyle.css => laststyle-20231214.css} (100%) create mode 100644 config/waybar/laststyle-20240811.css diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf index 60de2efa..c47a4abd 100644 --- a/config/hypr/hyprland.conf +++ b/config/hypr/hyprland.conf @@ -43,6 +43,7 @@ env = HYPRCURSOR,24 # Execute your favorite apps at launch exec-once = ~/.config/hypr/scripts/startup.sh exec-once = hypridle +exec-once = openrgb --startminimized exec-once = foot -s # Source a file (multi-file configs) @@ -70,7 +71,7 @@ general { gaps_in = 12 gaps_out = 20 - border_size = 2 + border_size = 1 col.active_border = rgba(2394ccee) rgba(638cacee) 45deg col.inactive_border = rgba(aaaaaa77) rgba(33333377) 45deg col.nogroup_border_active = rgba(993399ee) rgba(663399ee) 45deg @@ -122,13 +123,13 @@ animations { dwindle { # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more - pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + A in the keybinds section below - preserve_split = no # you probably want this + pseudotile = true # master switch for pseudotiling. Enabling is bound to mainMod + A in the keybinds section below + preserve_split = true # you probably want this } master { # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more - new_is_master = true + # new_is_master = true } gestures { @@ -140,6 +141,7 @@ misc { # See https://wiki.hyprland.org/Configuring/Variables/ for more force_default_wallpaper = 0 # Set to 0 to disable the anime mascot wallpapers key_press_enables_dpms = true + vrr = 2 } # Example per-device config @@ -184,14 +186,18 @@ windowrulev2 = size 60% 100%, float, title:^(NCMPCPP.*)$ # handle other clients windowrulev2 = float, size 1560 1000, pin, workspace special:overlay, class:^(org.keepassxc.KeePassXC)$ -# windowrule = float, ^(firefox)$ windowrulev2 = opacity 1.0 override 0.8 override, group, class:^(foot)$ windowrulev2 = float, opacity 1.0 override 0.8 override, class:^(popup)$ windowrulev2 = float, noanim, stayfocused, maxsize 1280 800, center, opacity 1.0 override, class:^(kakpopup)$ windowrule = float, ^(openrgb)$ windowrule = float, ^(org.kde.*)$ +windowrule = float, ^(kdesystemsettings.*)$ +windowrule = float, ^(pcmanfm.*)$ windowrule = float, ^(vlc.*)$ +windowrule = float, ^(pavucontrol.*)$ windowrule = float, class:^(qalculate.*)$ +windowrulev2 = float, class:^(lutris)$ +windowrulev2 = float, title:^(Über.*)$ # windowrule = float, ^(org.kde.okular)$ # windowrule = float, ^(org.kde.gwenview)$ # windowrule = float, ^(org.kde.skanlite)$ diff --git a/config/hypr/scripts/gammarelay-autotemp.py b/config/hypr/scripts/gammarelay-autotemp.py index b1cd3a90..48958a53 100755 --- a/config/hypr/scripts/gammarelay-autotemp.py +++ b/config/hypr/scripts/gammarelay-autotemp.py @@ -14,8 +14,8 @@ with open('/tmp/autotemp.pid', 'a') as pid_file: temp_day = 6500 temp_night = 4000 -dawn_time = 9 * 3600 # 9am -dusk_time = 18 * 3600 # 19pm +dawn_time = 6 * 3600 # 9am +dusk_time = 21 * 3600 # 19pm while True: temp = temp_day diff --git a/config/hypr/scripts/mousefocus_toggle.sh b/config/hypr/scripts/mousefocus_toggle.sh new file mode 100755 index 00000000..c51fe86f --- /dev/null +++ b/config/hypr/scripts/mousefocus_toggle.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +# toggles between 'click to focus' and 'focus follows mouse' +# +# shellcheck disable=SC2015 +hyprctl getoption input:follow_mouse | grep int:\ 0 && hyprctl keyword input:follow_mouse 1 || hyprctl keyword input:follow_mouse 0 + diff --git a/config/hypr/scripts/startup.sh b/config/hypr/scripts/startup.sh index db7acfe0..ac612df4 100755 --- a/config/hypr/scripts/startup.sh +++ b/config/hypr/scripts/startup.sh @@ -21,12 +21,12 @@ else logger 'dbus already running' fi -if [[ ! $(pidof /usr/lib64/libexec/polkit-kde-authentication-agent-1) ]]; then - if ! command -v /usr/lib64/libexec/polkit-kde-authentication-agent-1 &> /dev/null +if [[ ! $(pidof /usr/libexec/polkit-kde-authentication-agent-1) ]]; then + if ! command -v /usr/libexec/polkit-kde-authentication-agent-1 &> /dev/null then echo "polkit-kde not installed" else - /usr/lib64/libexec/polkit-kde-authentication-agent-1 & + /usr/libexec/polkit-kde-authentication-agent-1 & logger 'polit-kde started' fi else diff --git a/config/waybar/config b/config/waybar/config deleted file mode 100644 index e36ce64f..00000000 --- a/config/waybar/config +++ /dev/null @@ -1,236 +0,0 @@ -//# kak: filetype=json:ts=4:iw=4 -{ - "layer": "top", // Waybar at top layer - "position": "bottom", // Waybar position (top|bottom|left|right) - //"height": 26, // Waybar height (to be removed for auto height) - // "width": 1280, // Waybar width - "spacing": -8, // Gaps between modules (4px) - // Choose the order of the modules - "modules-left": ["hyprland/workspaces", "custom/spacer", "custom/gammarelay-temperature", "custom/gammarelay-gamma", "custom/gammarelay-brightness", "mpd"], -// "modules-left": ["hyprland/workspaces", "custom/spacer", "mpd"], - "modules-center": ["hyprland/window"], - "margin": "0", - "modules-right": ["keyboard-state", "cpu", "memory", "temperature#temp2", "temperature", "pulseaudio", "clock", "tray", "idle_inhibitor", "custom/wallpaper", "custom/powermenu"], - - // Modules configuration - - "hyprland/workspaces": { - "format": "{icon}", - "format-window-separator": " ", - //"window-rewrite-default": "", - //"window-rewrite": { - // "firefox": "", - // "kitty": "", - // "dolphin": "󱢴", - // "elisa": "", - // "steam": "󰓓", - // }, - "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": { - "1": [], - "2": [], - "3": [], - "4": [], - "5": [], - "6": [], - "7": [], - "8": [], - "9": [], - "0": [], - }, - "on-click": "activate", - "on-click-middle-release": "close", - "on-scroll-up": "hyprctl dispatch workspace e+1", - "on-scroll-down": "hyprctl dispatch workspace e-1", - "sort-by-number": true - }, - - "hyprland/window": { - "format": "{initialClass} - {title}", - }, - - - "keyboard-state": { - "numlock": true, - "capslock": true, - "format": "{icon} {name}", - "format-icons": { - "locked": " ", - "unlocked": " " - }, - }, - - - "mpd": { - "format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ⸨{songPosition}|{queueLength}⸩ {volume}% ", - "format-disconnected": "Disconnected ", - "format-stopped": "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon} ", - "unknown-tag": "N/A", - "interval": 2, - "consume-icons": { - "on": " " - }, - "random-icons": { - //"off": " ", - "off": "", - "on": " " - }, - "repeat-icons": { - "on": " " - }, - "single-icons": { - "on": "1 " - }, - "state-icons": { - "paused": "", - "playing": "" - }, - "tooltip-format": "MPD (connected)", - "tooltip-format-disconnected": "MPD (disconnected)" - }, - - - "tray": { - // "icon-size": 21, - "spacing": 10 - }, - - - "cpu": { - "format": " {usage:2}%", - "on-click": "/usr/bin/foot -a popup htop", - "interval": 2, - }, - - - "memory": { - "format": " {percentage:2}%", - "on-click": "/usr/bin/foot -a popup htop", - "interval": 2, - }, - - - "temperature": { - // "thermal-zone": 2, - "hwmon-path": "/sys/class/hwmon/hwmon4/temp7_input", - "critical-threshold": 60, - // "format-critical": "{temperatureC}°C {icon}", - "format": "{icon} {temperatureC}°C WaterGPU", - "format-icons": ["", "", ""] - }, - - "temperature#temp2": { - // "thermal-zone": 2, - "hwmon-path": "/sys/class/hwmon/hwmon4/temp6_input", - "critical-threshold": 60, - // "format-critical": "{temperatureC}°C {icon}", - "format": "{icon} {temperatureC}°C WaterCPU", - "format-icons": ["", "", ""] - }, - - - "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}" - }, - - - "pulseaudio": { - // "scroll-step": 1, // %, 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" - }, - - - "clock": { - "timezone": "Europe/Berlin", - "tooltip-format": "{:%Y %B}\n{calendar}", - "format-alt": "{:%Y-%m-%d}" - }, - - - "idle_inhibitor": { - "format": " {icon} ", - "format-icons": { - "activated": "", - "deactivated": "" - } - }, - - - "custom/wallpaper": { - "format": "  ", - "on-click": "$HOME/.local/bin/rndwallpaper swww", - "tooltip": false, - "interval": "once", - }, - - - "custom/powermenu": { - "format": " ⏻ ", - "on-click": "$HOME/.config/hypr/scripts/powermenu.sh", - "tooltip": false, - "interval": "once", - }, - - "custom/spacer": { - "format": " ", - "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", - "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" - }, - -} diff --git a/config/waybar/config.jsonc b/config/waybar/config.jsonc new file mode 100644 index 00000000..99a16f64 --- /dev/null +++ b/config/waybar/config.jsonc @@ -0,0 +1,292 @@ +//# 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", + ], + + // Modules configuration + + "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, + }, + + "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, + }, + + "keyboard-state": { + "numlock": true, + "capslock": true, + "format": "{icon} {name}", + "format-icons": { + "locked": " ", + "unlocked": " ", + }, + }, + + "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", + }, + + "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", + }, + + "tray": { + "icon-size": 26, + "spacing": 10, + }, + + "cpu": { + "format": "{usage:3}%", + "on-click": "/usr/bin/foot -a popup htop", + "interval": 2, + }, + + "memory": { + "format": "{percentage:3}%", + "on-click": "/usr/bin/foot -a popup htop", + "interval": 2, + }, + + "temperature": { + "hwmon-path": "/sys/class/hwmon/hwmon4/temp6_input", + "critical-threshold": 42, + "format": "{icon}H2O:{temperatureC}°C", + "format-icons": ["", "", ""], + }, + + "temperature#cpu": { + "hwmon-path": "/sys/class/hwmon/hwmon3/temp1_input", + "critical-threshold": 75, + "format": "{icon}CPU:{temperatureC}°C", + "format-icons": ["", "", ""], + }, + + "temperature#chipset": { + "hwmon-path": "/sys/class/hwmon/hwmon4/temp5_input", + "critical-threshold": 75, + "format": "{icon}Chipset:{temperatureC}°C", + "format-icons": ["", "", ""], + }, + + "temperature#vrm": { + "hwmon-path": "/sys/class/hwmon/hwmon4/temp9_input", + "critical-threshold": 95, + "format": "{icon}VRM:{temperatureC}°C", + "format-icons": ["", "", ""], + }, + + "temperature#gpu": { + "hwmon-path": "/sys/class/drm/card0/device/hwmon/hwmon0/temp2_input", + "critical-threshold": 110, + "format": "{icon}GPU:{temperatureC}°C", + "format-icons": ["", "", ""], + }, + + "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}", + }, + + "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", + }, + + "clock": { + "timezone": "Europe/Berlin", + "tooltip-format": "{:%Y %B}\n{calendar}", + "format-alt": "{:%Y-%m-%d}", + }, + + "idle_inhibitor": { + "format": " {icon} ", + "format-icons": { + "activated": "", + "deactivated": "", + }, + }, + + "custom/wallpaper": { + "format": "  ", + "on-click": "$HOME/.local/bin/rndwallpaper swww", + "tooltip": false, + "interval": "once", + }, + + "custom/powermenu": { + "format": " ⏻ ", + "on-click": "$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", + "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/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", + ], + }, +} diff --git a/config/waybar/oldstyle.css b/config/waybar/laststyle-20231214.css similarity index 100% rename from config/waybar/oldstyle.css rename to config/waybar/laststyle-20231214.css diff --git a/config/waybar/laststyle-20240811.css b/config/waybar/laststyle-20240811.css new file mode 100644 index 00000000..9ad9b3c8 --- /dev/null +++ b/config/waybar/laststyle-20240811.css @@ -0,0 +1,150 @@ +* { + font-family: "BlexMono Nerd Font"; + font-size: 11pt; + min-height: 0px; +} + +/* ----------------------------------- window ----------------------------------- */ +#window { + padding: 0 76px; + margin: 0 4px; + background-color: rgba(124,175,194,1.0); + border-bottom: 1px solid rgba(100, 114, 125, 1); + color: #181818; +} + +window#waybar { + padding: 0 16px; + margin: 0 4px; + background-color: rgba(59, 64, 69, 1.0); + border-bottom: 1px solid rgba(100, 114, 125, 1); + color: #eff0f1; + transition-property: background-color; + transition-duration: .5s; +} +window#waybar.hidden { + opacity: 0.2; +} +window#waybar.empty { + background-color: transparent; + background-image: linear-gradient(180deg, rgba(42,46,50,1.0), rgba42,46,50,0.7), rgba(22,24,30,0)); + border-bottom: 1px solid rgba(100, 114, 125, 0.0); +} +window#waybar.foot { + background-color: rgba(62,79,95,1.0); +} + +/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */ +button:hover { + padding: 0 8px; + background: inherit; + box-shadow: inset 0 -3px #ffffff; +} + +/* ---------------------------------- workspaces ---------------------------------- */ +#workspaces { + padding: 0 8px; + background-image: linear-gradient(180deg, rgba(228,169,68, 1.0), rgba(228,169,68, 0.6), rgba(59, 64, 69, 0.5)); + border-bottom: 1px solid rgba(100, 114, 125, 1); +} +#workspaces button { + box-shadow: inherit; + text-shadow: inherit; + border: none; + border-radius: 0; + color: #181818; +} +#workspaces button:hover { + box-shadow: inherit; + text-shadow: inherit; +} +#workspaces button.active { + background-image: linear-gradient(180deg, rgba(124,175,194,1.0), rgba(124,175,194,0.6), rgba(59, 64, 69, 0.5)); + /*background-color: rgba(124,175,194,1.0);*/ +} +#workspaces button.focused { + background-color: rgba(124,175,194,1.0); +} +#workspaces button.urgent { + background-color: #da4453; + color: #fcfcfc; +} + + +/* ------------------------------------ modules ------------------------------------ */ +#cpu, +#pulseaudio, +#memory { + padding: 0 16px; + margin: 0 4px; + color: #eff0f1; +} + +#clock, +#keyboard-state, +#temperature, +#temperature#temp2 { + padding: 0 16px; + margin: 0 4px; + color: #eff0f1; +} + + +#mpris { + padding: 0 16px; + margin: 0 4px; + background-color: rgba(23,28,39,0.3); + color: #eff0f1; +} + + +#mpd { + padding: 0 16px; + margin: 0 4px; + color: #eff0f1; + min-height: 0px; +} + + +#clock { + padding-left: 16px; + margin: 0 4px; +} + + +#custom-spacer { + padding: 0 0px; + margin: 0 1px; +} + + +#idle_inhibitor, +#custom-powermenu, +#custom-wallpaper { + padding: 0 8px; + margin: 0 4px; + color: #181818; + background-image: linear-gradient(0deg, rgba(228,169,68, 0.9), rgba(228,169,68, 0.6), rgba(59, 64, 69, 0.5)); + border-bottom: 3px solid rgba(100, 114, 125, 1); +} + + +#custom-gammarelay-temperature, +#custom-gammarelay-gamma, +#custom-gammarelay-brightness { + padding: 0 16px; + margin: 0 4px; + color: #181818; + background-image: linear-gradient(0deg, rgba(124,184,143, 0.9), rgba(124,184,143, 0.6), rgba(59, 64, 69, 0.5)); + border-bottom: 3px solid rgba(100, 114, 125, 1); +} + + +#tray { + padding: 0 16px; + margin: 0 4px; + color: #fcfcfc; + /*background-color: rgba(228,169,68, 0.8); + background-image: linear-gradient(0deg, rgba(228,169,68, 1.0), rgba(228,169,68, 1.0), rgba(228,169,68, 0.4), rgba(22,24,30,0.4)) + */ +} diff --git a/config/waybar/style.css b/config/waybar/style.css index 3dd71ae7..95e45119 100644 --- a/config/waybar/style.css +++ b/config/waybar/style.css @@ -1,145 +1,233 @@ +/* ----------------------------------- 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); + * { - font-family: "BlexMono Nerd Font"; - font-size: 11pt; - min-height: 0px; + font-family: "BlexMono Nerd Font"; + font-size: 11pt; + min-height: 0px; + font-weight: 500; + 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; +} + +/* ---------------------------------- tooltip ---------------------------------- */ +tooltip { + background: @bs; + border: 1px @border; + border-radius: 0; +} +tooltip label { + color: @text; } +/* ----------------------------------- window ----------------------------------- */ #window { - padding: 0 76px; + padding: 0 8px; margin: 0 4px; - background-color: rgba(124,175,194,1.0); - border-bottom: 3px solid rgba(100, 114, 125, 1); - color: #181818; +} + +window#waybar.empty #window { + background-color: transparent; } window#waybar { - padding: 0 16px; - margin: 0 4px; - background-color: rgba(59, 64, 69, 1.0); - border-bottom: 3px solid rgba(100, 114, 125, 1); - color: #eff0f1; + background-color: rgba(59, 64, 69, 1); + border-bottom: 1px solid rgba(100, 114, 125, 1); + color: @wt9; transition-property: background-color; - transition-duration: .5s; + transition-duration: 0.5s; } window#waybar.hidden { opacity: 0.2; } window#waybar.empty { background-color: transparent; - background-image: linear-gradient(0deg, rgba(42,46,50,1.0), rgba(22,24,30,0)) + 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); } window#waybar.foot { - background-color: rgba(62,79,95,1.0); -} - -/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */ -button:hover { - padding: 0 8px; - background: inherit; - box-shadow: inset 0 -3px #ffffff; + background-color: rgba(62, 79, 95, 1); } +/* ---------------------------------- workspaces ---------------------------------- */ #workspaces { - padding: 0 8px; - background-image: linear-gradient(0deg, rgba(228,169,68, 0.9), rgba(228,169,68, 0.6), rgba(59, 64, 69, 0.5)); - border-bottom: 3px solid rgba(100, 114, 125, 1); + padding: 0 8px; + margin: 4px; } + #workspaces button { - box-shadow: inherit; - text-shadow: inherit; - border: none; - border-radius: 0; - color: #181818; + background-color: transparent; + color: @wt4; + transition: all 0.3s ease; } + #workspaces button:hover { - box-shadow: inherit; - text-shadow: inherit; + box-shadow: inherit; + text-shadow: inherit; + background: transparent; + border: 1px solid rgba(0, 0, 0, 0); + color: @wt8; + transition: all 0.3s ease; } + +#workspaces button.focused, #workspaces button.active { - background-image: linear-gradient(0deg, rgba(124,175,194,0.9), rgba(124,175,194,0.7), rgba(59, 64, 69, 0.5)); -} -#workspaces button.focused { - background-color: rgba(124,175,194,1.0); + color: @red; + transition: all 0.3s ease; + animation: colored-gradient 10s ease infinite; } + #workspaces button.urgent { - background-color: #da4453; - color: #fcfcfc; + background-color: @red; + color: @bs; + transition: all 0.3s ease; } - +/* ------------------------------------ modules ------------------------------------ */ #cpu, -#pulseaudio, #memory { - padding: 0 16px; - margin: 0 4px; - color: #eff0f1; + padding: 0 8px; + color: @wt8; + border-bottom: 1px @border; } -#clock, -#keyboard-state, #temperature, -#temperature#temp2 { - padding: 0 16px; - margin: 0 4px; - color: #eff0f1; +#temperature#cpu, +#temperature#chipset, +#temperature#vrm, +#temperature#gpu { + padding: 0 8px; + color: @bt8; + background-color: @orange; + border-bottom: 1px @border; } - -#mpris { - padding: 0 16px; - margin: 0 4px; - background-color: rgba(23,28,39,0.3); - color: #eff0f1; +#temperature.critical, +#temperature#cpu.critical, +#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: 0 16px; + padding: 4px; margin: 0 4px; color: #eff0f1; min-height: 0px; } - - -#clock { - padding-left: 16px; - margin: 0 4px; +#mpd#volume { + padding: 4px; + margin: 0 9px; } - #custom-spacer { - padding: 0 0px; - margin: 0 1px; + /* padding: 0 0px;*/ + /* margin: 0 1px;*/ } - -#idle_inhibitor, -#custom-powermenu, -#custom-wallpaper { +#tray { padding: 0 8px; - margin: 0 4px; - color: #181818; - background-image: linear-gradient(0deg, rgba(228,169,68, 0.9), rgba(228,169,68, 0.6), rgba(59, 64, 69, 0.5)); - border-bottom: 3px solid rgba(100, 114, 125, 1); + margin: 0 8px; + color: @ws; + border-bottom: 1px @border; } - #custom-gammarelay-temperature, #custom-gammarelay-gamma, #custom-gammarelay-brightness { - padding: 0 16px; - margin: 0 4px; - color: #181818; - background-image: linear-gradient(0deg, rgba(124,184,143, 0.9), rgba(124,184,143, 0.6), rgba(59, 64, 69, 0.5)); - border-bottom: 3px solid rgba(100, 114, 125, 1); + 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; +} -#tray { - padding: 0 16px; - margin: 0 4px; - color: #fcfcfc; - /*background-color: rgba(228,169,68, 0.8); - background-image: linear-gradient(0deg, rgba(228,169,68, 1.0), rgba(228,169,68, 1.0), rgba(228,169,68, 0.4), rgba(22,24,30,0.4)) - */ +#custom-wallpaper { + padding: 0 4px; + color: @bs; + background-color: @yellow; + border-bottom: 1px @border; +} + +#custom-powermenu { + padding: 0 4px; + color: @bs; + background-color: @yellow; + border-bottom: 1px @border; } -- 2.51.2