1 files changed, 43 insertions, 16 deletions

diff --git a/waybar/config b/waybar/config
index a239f8f..7e7b530 100644
--- a/waybar/config
+++ b/waybar/config
@@ -2,7 +2,7 @@
     "height": 30, 
     "spacing": 4, 
     "modules-left": ["sway/workspaces", "sway/mode"],
-    "modules-right": ["tray", "custom/spotify", "pulseaudio", "network", "cpu", "memory", "temperature", "clock"],
+    "modules-right": ["tray", "custom/spotify", "idle_inhibitor", "network", "cpu", "memory", "backlight", "pulseaudio", "battery", "clock"],
     "custom/spotify": {
         "exec": "/usr/bin/python3 ~/.config/waybar/scripts/mediaplayer.py --player spotify",
         "format": "{}",
@@ -31,40 +31,67 @@
         "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
         "format": "{:%d/%m/%Y  %H:%M:%S}",
         "format-alt": "{:%Y-%m-%d}",
+        "timezone": "Europe/London",
         "interval": 1
     },
+    "battery": {
+        "interval": 1,
+        "states": {
+            "warning": 30,
+            "critical": 15,
+        },
+        "format": "{icon} {capacity}%",
+        "format-charging": "{icon} {capacity}% ",
+        "format-icons": [" ", " ", " ", " ", " "],
+    },
+    "backlight": {
+        "format": "{icon} {percent}%",
+        "format-icons": [" ", " "],
+        "on-scroll-up": "brightnessctl set +5",
+        "on-scroll-down": "brightnessctl set 5-"
+    },
     "cpu": {
-        "format": " {usage}%",
+        "format": "  {usage}%",
         "tooltip": false
     },
     "memory": {
-        "format": " {used}/{total} GiB"
+        "format": "  {used}/{total} GiB"
     },
     "network": {
-        "format-wifi": "{essid} ({signalStrength}%) ",
+        "format-wifi": "  {ipaddr} @ {essid} ({signalStrength}%)",
         "format-ethernet": "歷 {ipaddr}",
-        "tooltip-format": "{ifname} via {gwaddr} ",
+        "tooltip-format": "  {ifname} via {gwaddr}",
         "format-linked": "歷 {ifname} (No IP)",
         "format-disconnected": "歷 Disconnected",
-        "format-alt": "{ifname}: {ipaddr}/{cidr}"
+        "format-alt": "{ifname}: {ipaddr}/{cidr}",
+        "on-click-right": "alacritty -e /usr/bin/nmtui",
     },
     "pulseaudio": {
-        "format": "{icon} {volume}% {format_source}",
-        "format-bluetooth": "{volume}% {icon} {format_source}",
-        "format-bluetooth-muted": " {icon} {format_source}",
-        "format-muted": " {format_source}",
+        "format": "{icon} {volume}%  {format_source}",
+        "format-bluetooth": " {volume}%  {format_source}",
+        "format-bluetooth-muted": " 婢  {format_source}",
+        "format-muted": "婢 {format_source}",
         "format-source": " {volume}%",
-        "format-source-muted": "",
+        "format-source-muted": " ",
         "format-icons": {
-            "headphone": "",
+            "headphone": " ",
             "hands-free": "",
             "headset": "",
             "phone": "",
             "portable": "",
-            "car": "",
-            "default": ["", "", ""]
+            "car": " ",
+            "default": ["", " ", " "]
         },
-        "on-click": "pavucontrol"
-    }
+        "on-click": "pactl set-sink-mute @DEFAULT_SINK@ toggle",
+        "on-click-right": "pavucontrol",
+        "scroll-step": 0.5
+    },
+    "idle_inhibitor": {
+        "format": "{icon}",
+        "format-icons": {
+            "activated": "",
+            "deactivated": ""
+        }
+	}
 }