diff --git a/configs/waybar/config.jsonc b/configs/waybar/config.jsonc index 312ca18..fc7884b 100644 --- a/configs/waybar/config.jsonc +++ b/configs/waybar/config.jsonc @@ -5,7 +5,7 @@ "spacing": 0, "modules-left": ["wlr/taskbar"], "modules-center": ["clock"], - "modules-right": ["network","bluetooth","custom/spotify","custom/language","pulseaudio","cpu","battery","power-profiles-daemon","wlr/tray","clock#date"], + "modules-right": ["network","bluetooth","custom/proxy","custom/spotify","custom/language","pulseaudio","cpu","battery","power-profiles-daemon","wlr/tray","clock#date"], "wlr/taskbar": { "format": "{icon}", @@ -15,22 +15,33 @@ }, "custom/language": { "exec": "xkb-switch -p | tr '[:lower:]' '[:upper:]' || echo '??'", + "tooltip": false, "interval": 1, "format": "[ {}]" }, "custom/spotify": { "format": "[played: [{}] ]", "exec": "playerctl metadata --format '{{artist}} - {{title}}' spotify 2>/dev/null || echo ''", + "tooltip": false, "restart-interval": 1, "on-click": "spotify-launcher", "max-length": 50 }, + "custom/proxy": { + "format": "[proxy]", + "tooltip": false, + "on-click": "alacritty -e sudo yast2 proxy" + }, + + "clock": { "format": "[{:%H:%M}]", + "tooltip": false, "on-click": "gnome-calendar" }, "clock#date": { "format": "[{:%d-%m-%Y}]", + "tooltip": false, "on-click": "gnome-calendar" }, "cpu": { @@ -47,7 +58,7 @@ "on-click": "nm-connection-editor" }, "bluetooth": { - "format": "[  ]", + "format": "[ blu-th]", "format-disabled": "[🛪 disabled]", "format-off": "[🛦 off]", "format-connected": "[ {num_connections}]", @@ -57,7 +68,7 @@ "on-click": "blueman-manager" }, "battery": { - "format": "[{icon} {capacity}%] ", + "format": "[{icon} {capacity}%]", "format-charging": "[ {capacity}% {icon}]", "format-plugged": "[ {capacity}%]", "interval": 1, @@ -77,8 +88,7 @@ }, "power-profiles-daemon": { "format": "[{icon}]", - "tooltip-format": "Профиль: {profile}", - "tooltip": true, + "tooltip": false, "format-icons": { "default": "default", "performance": "performance", diff --git a/configs/waybar/style.css b/configs/waybar/style.css index 2373c95..123a856 100644 --- a/configs/waybar/style.css +++ b/configs/waybar/style.css @@ -11,6 +11,7 @@ window#waybar { min-height: 28px; } +/* Добавляем ВСЕ модули с вашей панели, включая proxy, battery и профили питания */ #clock, #cpu, #memory, @@ -19,8 +20,13 @@ window#waybar { #taskbar, #custom-spotify, #custom-language, +#custom-proxy, +#battery, +#power-profiles-daemon, +#custom-power, +#bluetooth, #tray { - padding: 0 10px; + padding: 0 6px; /* Немного уменьшили с 10px до 6px, чтобы скобки не разлетались слишком далеко */ color: #0b0b0b; }