done

configs/waybar/config.jsonc

@@ -5,7 +5,7 @@
     "spacing": 0,
     "modules-left": ["wlr/taskbar"],
     "modules-center": ["clock"],
-    "modules-right": ["network", "custom/spotify", "custom/v2raya", "custom/language", "pulseaudio", "cpu", "memory", "tray"],
+    "modules-right": ["network", "bluetooth", "custom/spotify", "custom/language", "pulseaudio", "cpu", "memory", "battery", "wlr/tray"],
 
     "wlr/taskbar": {
         "format": "{icon}",
@@ -21,18 +21,10 @@
     "custom/spotify": {
         "format": "[{}] ",
         "exec": "playerctl metadata --format '{{artist}} - {{title}}' spotify 2>/dev/null || echo ''",
-        "on-click": "ironbar bar spotify-popup toggle-popup spotify-music",
-        "interval": 3,
+        "restart-interval": 1,
+        "on-click": "spotify",
         "max-length": 50
     },
-    "custom/v2raya": {
-        "format": "PROXY{}",
-        "return-type": "json",
-        "interval": 2,
-        "exec": "/home/ivan/.config/waybar/v2raya-toggle.sh",
-        "on-click": "/home/ivan/.config/waybar/v2raya-toggle.sh toggle",
-        "signal": 10
-    },
     "clock": {
         "format": "{:%H:%M}",
         "format-alt": "{:%d-%m-%Y}"
@@ -50,14 +42,43 @@
         "format-wifi": " {bandwidthDownBytes}",
         "format-ethernet": " {bandwidthDownBytes}",
         "format-disconnected": "⚠ DONT",
-        "interval": 1 
+        "interval": 1,
+        "on-click": "alacritty -e nmtui"
+    },
+    "bluetooth": {
+        "format": "",
+        "format-disabled": "󰂲",
+        "format-off": "󰂲",
+        "format-connected": " {num_connections}",
+
+        "tooltip-format": "{device_enumerate}",
+
+        "on-click": "blueman-manager"
+    },
+    "battery": {
+        "format": "{capacity}% {icon}",
+        "format-charging": " {capacity}% {icon}",
+        "format-plugged": " {capacity}%",
+
+        "format-icons": [
+            "",
+            "",
+            "",
+            "",
+            ""
+        ],
+
+        "states": {
+            "warning": 30,
+            "critical": 15
+        }
     },
     "pulseaudio": {
         "format": "  {volume}%",
         "format-muted": "  Muted",
         "on-click": "pavucontrol"
     },
-    "tray": {
+    "wlr/tray": {
         "icon-size": 10,
         "spacing": 15
     }

configs/waybar/style.css

@@ -1,15 +1,13 @@
 * {
-    font-family: "JetBrainsMono Nerd Font", "Font Awesome 7 Free", "Font Awesome 7 Free Solid", "Font Awesome 7 Brands", sans-serif;
+    font-family: "JetBrainsMono Nerd Font";
     font-size: 12px;
     border: none;
     border-radius: 0;
 }
 
-@import "/home/ivan/.config/aether/theme/waybar.css";
-
 window#waybar {
-    background: alpha(@background, 0.75);
-    color: @foreground;
+    background: alpha(#e3e3e3, 0.75);
+    color: #0b0b0b;
     min-height: 28px;
 }
 
@@ -22,24 +20,16 @@ window#waybar {
 #custom-spotify,
 #tray {
     padding: 0 10px; 
-    color: @foreground;
+    color: #0b0b0b;
 }
 
 #taskbar button {
-    color: alpha(@foreground, 0.6);
+    color: alpha(#0b0b0b, 0.6);
     padding: 0 8px;
 }
 
 #taskbar button.active {
-    background-color: alpha(@foreground, 0.2);
-    box-shadow: inset 0 -2px 0 0 @foreground;
-    color: @foreground;
-}
-
-#custom-v2raya.enabled {
-    color: @foreground;
-}
-
-#custom-v2raya.disabled {
-    color: @background;
+    background-color: alpha(#0b0b0b, 0.2);
+    box-shadow: inset 0 -2px 0 0 #0b0b0b;
+    color: #0b0b0b;
 }

configs/waybar/v2raya-toggle.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 
-# Проверяем, запущен ли процесс v2rayA
 if pgrep -x "v2raya" > /dev/null; then
     if [ "$1" = "toggle" ]; then
         sudo systemctl stop v2raya.service 2>/dev/null || sudo killall v2raya