From 091930c6326a5f104e0624285a1ad85ef78ee8a6 Mon Sep 17 00:00:00 2001 From: Frantisek Bohacek Date: Sat, 4 May 2024 12:13:35 +0200 Subject: [PATCH] feat: remove backlight from waybar on different monitors, move window to left, ... --- .../profiles/desktop/dwl/waybar/config.jsonc | 245 +++++++++++------- .../profiles/desktop/dwl/waybar/style.css | 10 +- 2 files changed, 154 insertions(+), 101 deletions(-) diff --git a/home/modules/profiles/desktop/dwl/waybar/config.jsonc b/home/modules/profiles/desktop/dwl/waybar/config.jsonc index e913be1..496875a 100644 --- a/home/modules/profiles/desktop/dwl/waybar/config.jsonc +++ b/home/modules/profiles/desktop/dwl/waybar/config.jsonc @@ -2,6 +2,7 @@ [ { "ipc": true, + "output": "!eDP-1", // "layer": "top", // Waybar at top layer // "position": "bottom", // Waybar position (top|bottom|left|right) "height": 20, // Waybar height (to be removed for auto height) @@ -9,22 +10,19 @@ "spacing": 4, // Gaps between modules (4px) // Choose the order of the modules "modules-left": [ - "dwl/tags" + "dwl/tags", + "dwl/window" ], "modules-center": [ - "dwl/window" ], "modules-right": [ - "mpd", "idle_inhibitor", - //"pulseaudio", + "pulseaudio", "network", "power-profiles-daemon", "cpu", "memory", "temperature", - "backlight", - "keyboard-state", "sway/language", "battery", "clock", @@ -35,36 +33,10 @@ }, "dwl/window": { "format": "{title}", - "max-length": 50, + "max-length": 50, "rewrite": { "(.*) - Mozilla Firefox": "🌎 $1", "(.*) — Mozilla Firefox": "🌎 $1" - } - }, - // Modules configuration - // "sway/workspaces": { - // "disable-scroll": true, - // "all-outputs": true, - // "warp-on-scroll": false, - // "format": "{name}: {icon}", - // "format-icons": { - // "1": "", - // "2": "", - // "3": "", - // "4": "", - // "5": "", - // "urgent": "", - // "focused": "", - // "default": "" - // } - // }, - "keyboard-state": { - "numlock": true, - "capslock": true, - "format": "{name} {icon}", - "format-icons": { - "locked": "", - "unlocked": "" } }, "sway/mode": { @@ -77,31 +49,143 @@ "tooltip": true, "tooltip-format": "{app}: {title}" }, - "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}Stopped ", - "unknown-tag": "N/A", - "interval": 5, - "consume-icons": { - "on": " " - }, - "random-icons": { - "off": " ", - "on": " " - }, - "repeat-icons": { - "on": " " - }, - "single-icons": { - "on": "1 " + "idle_inhibitor": { + "format": "{icon}", + "format-icons": { + "activated": "", + "deactivated": "" + } + }, + "tray": { + // "icon-size": 21, + "spacing": 10 + }, + "clock": { + "interval": 1, + "tooltip-format": "{:%Y %B}\n{calendar}", + "format-alt": "{:%Y-%m-%d}", + "format": "{:%Y-%m-%d %H:%M:%S}" + }, + "cpu": { + "format": "{usage}% ", + "tooltip": false + }, + "memory": { + "format": "{}% " + }, + "temperature": { + // "thermal-zone": 2, + // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input", + "critical-threshold": 80, + // "format-critical": "{temperatureC}°C {icon}", + "format": "{temperatureC}°C {icon}", + "format-icons": ["", "", ""] + }, + "battery": { + "states": { + // "good": 95, + "warning": 30, + "critical": 15 }, - "state-icons": { - "paused": "", - "playing": "" + "format": "{capacity}% {icon}", + "format-full": "{capacity}% {icon}", + "format-charging": "{capacity}% ", + "format-plugged": "{capacity}% ", + "format-alt": "{time} {icon}", + // "format-good": "", // An empty format will hide the module + // "format-full": "", + "format-icons": ["", "", "", "", ""] + }, + "power-profiles-daemon": { + "format": "{icon}", + "tooltip-format": "Power profile: {profile}\nDriver: {driver}", + "tooltip": true, + "format-icons": { + "default": "", + "performance": "", + "balanced": "", + "power-saver": "" + } + }, + "network": { + // "interface": "wlp2*", // (Optional) To force the use of this interface + "format-wifi": "{essid} ({signalStrength}%) ", + "format-ethernet": "", + "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": "{volume}% {icon} {format_source}", + "format-bluetooth": "{volume}% {icon} {format_source}", + "format-bluetooth-muted": " {icon} {format_source}", + "format-muted": " {format_source}", + "format-source": "", + "format-source-muted": "", + "format-icons": { + "headphone": "", + "hands-free": "", + "headset": "", + "phone": "", + "portable": "", + "car": "", + "default": ["", "", ""] }, - "tooltip-format": "MPD (connected)", - "tooltip-format-disconnected": "MPD (disconnected)" + "on-click": "pavucontrol" + }, +}, + +{ + "ipc": true, + "output": "eDP-1", + // "layer": "top", // Waybar at top layer + // "position": "bottom", // Waybar position (top|bottom|left|right) + "height": 20, // Waybar height (to be removed for auto height) + // "width": 1280, // Waybar width + "spacing": 4, // Gaps between modules (4px) + // Choose the order of the modules + "modules-left": [ + "dwl/tags", + "dwl/window" + ], + "modules-center": [ + ], + "modules-right": [ + "idle_inhibitor", + "pulseaudio", + "network", + "power-profiles-daemon", + "cpu", + "memory", + "temperature", + "backlight", + "sway/language", + "battery", + "clock", + "tray" + ], + "dwl/tags": { + "num-tags": 9 + }, + "dwl/window": { + "format": "{title}", + "max-length": 50, + "rewrite": { + "(.*) - Mozilla Firefox": "🌎 $1", + "(.*) — Mozilla Firefox": "🌎 $1" + } + }, + "sway/mode": { + "format": "{}" + }, + "sway/scratchpad": { + "format": "{icon} {count}", + "show-empty": false, + "format-icons": ["", ""], + "tooltip": true, + "tooltip-format": "{app}: {title}" }, "idle_inhibitor": { "format": "{icon}", @@ -115,11 +199,10 @@ "spacing": 10 }, "clock": { - // "timezone": "America/New_York", - "interval": 1, + "interval": 1, "tooltip-format": "{:%Y %B}\n{calendar}", "format-alt": "{:%Y-%m-%d}", - "format": "{:%Y-%m-%d %H:%M:%S}" + "format": "{:%Y-%m-%d %H:%M:%S}" }, "cpu": { "format": "{usage}% ", @@ -156,9 +239,6 @@ // "format-full": "", "format-icons": ["", "", "", "", ""] }, - "battery#bat2": { - "bat": "BAT2" - }, "power-profiles-daemon": { "format": "{icon}", "tooltip-format": "Power profile: {profile}\nDriver: {driver}", @@ -173,7 +253,7 @@ "network": { // "interface": "wlp2*", // (Optional) To force the use of this interface "format-wifi": "{essid} ({signalStrength}%) ", - "format-ethernet": "{ipaddr}/{cidr} ", + "format-ethernet": "", "tooltip-format": "{ifname} via {gwaddr} ", "format-linked": "{ifname} (No IP) ", "format-disconnected": "Disconnected ⚠", @@ -185,7 +265,7 @@ "format-bluetooth": "{volume}% {icon} {format_source}", "format-bluetooth-muted": " {icon} {format_source}", "format-muted": " {format_source}", - "format-source": "{volume}% ", + "format-source": "", "format-source-muted": "", "format-icons": { "headphone": "", @@ -198,40 +278,5 @@ }, "on-click": "pavucontrol" }, - "custom/media": { - "format": "{icon} {}", - "return-type": "json", - "max-length": 40, - "format-icons": { - "spotify": "", - "default": "🎜" - }, - "escape": true, - "exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder - // "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name - } -}//, -//{ -// "position": "bottom", -// "modules-left": [ -// "wlr/taskbar" -// ], -// "wlr/taskbar": { -// "format": "{icon}", -// "icon-size": 14, -// "icon-theme": "Numix-Circle", -// "tooltip-format": "{title}", -// "on-click": "activate", -// "on-click-middle": "close", -// "ignore-list": [ -// ], -// "app_ids-mapping": { -// "firefoxdeveloperedition": "firefox-developer-edition" -// }, -// "rewrite": { -// "Firefox Web Browser": "Firefox", -// "Foot Server": "Terminal" -// } -// } -// } +} ] diff --git a/home/modules/profiles/desktop/dwl/waybar/style.css b/home/modules/profiles/desktop/dwl/waybar/style.css index 71cb450..5508f1f 100644 --- a/home/modules/profiles/desktop/dwl/waybar/style.css +++ b/home/modules/profiles/desktop/dwl/waybar/style.css @@ -1,6 +1,6 @@ * { /* `otf-font-awesome` is required to be installed for icons */ - font-family: FontAwesome, Roboto, Helvetica, Arial, sans-serif; + font-family: FontAwesome, Ubuntu; font-size: 13px; } @@ -343,3 +343,11 @@ label:focus { background-color: #2980b9; box-shadow: inset 0 -3px #1bd6e0; } + +#tags button.urgent { + background-color: #eb4d4b; +} + +#tags button.urgent.focused { + background-color: #f0932b; +} -- 2.48.1