1 files changed, 62 insertions, 12 deletions
diff --git a/dotfiles/hyprland/.config/waybar/config b/dotfiles/hyprland/.config/waybar/config
index 5481a86..c7cc0a7 100644
--- a/dotfiles/hyprland/.config/waybar/config
+++ b/dotfiles/hyprland/.config/waybar/config
@@ -8,22 +8,27 @@
     "margin-right": 10,
 
     "modules-left": [
-        "hyprland/workspaces"
+        "hyprland/workspaces",
+        "custom/layout",
+        "hyprland/window"
     ],
     "modules-center": [],
     "modules-right": [
         "group/sysmonitor",
+        "custom/netspeed",
+        "wireplumber",
         "tray",
-        "clock",
-        "wireplumber"
+        "clock"
     ],
 
     "group/sysmonitor": {
         "orientation": "horizontal",
         "modules": [
             "cpu",
+            "temperature",
             "memory",
-            "disk"
+            "disk",
+            "battery"
         ]
     },
 
@@ -34,20 +39,65 @@
         "sort-by-number": true
     },
 
+    "custom/layout": {
+        "exec": "waybar-layout",
+        "return-type": "json",
+        "interval": 1,
+        "on-click": "cycle-layout"
+    },
+
+    "hyprland/window": {
+        "max-length": 50,
+        "separate-outputs": true
+    },
+
     "cpu": {
         "interval": 10,
-        "format": "CPU {}%"
+        "format": "<span size='large'>󰍛</span> {}%",
+        "on-click": "toggle-scratchpad monitor"
+    },
+
+    "temperature": {
+        "interval": 10,
+        "hwmon-path-abs": "/sys/devices/pci0000:00/0000:00:18.3/hwmon",
+        "input-filename": "temp1_input",
+        "critical-threshold": 80,
+        "format": "<span size='large'>󰔏</span> {temperatureC}°C",
+        "format-critical": "<span size='large'>󰸁</span> {temperatureC}°C",
+        "on-click": "toggle-scratchpad monitor"
     },
 
     "memory": {
         "interval": 30,
-        "format": "MEM {}%"
+        "format": "<span size='large'>󰘚</span> {}%",
+        "on-click": "toggle-scratchpad monitor"
     },
 
     "disk": {
         "interval": 30,
-        "format": "DSK {percentage_used}%",
-        "path": "/"
+        "format": "<span size='large'>󰆼</span> {percentage_used}%",
+        "path": "/",
+        "on-click": "toggle-scratchpad monitor"
+    },
+
+    "custom/netspeed": {
+        "exec": "waybar-netspeed",
+        "return-type": "json",
+        "interval": 2,
+        "on-click": "toggle-scratchpad network"
+    },
+
+    "battery": {
+        "interval": 30,
+        "states": {
+            "warning": 30,
+            "critical": 15
+        },
+        "format": "<span size='large'>{icon}</span> {capacity}%",
+        "format-charging": "<span size='large'>󰂄</span> {capacity}%",
+        "format-plugged": "<span size='large'>󰚥</span> {capacity}%",
+        "format-icons": ["󰂎", "󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂂", "󰁹"],
+        "tooltip-format": "{timeTo}"
     },
 
     "tray": {
@@ -56,7 +106,7 @@
     },
 
     "clock": {
-        "format": "{:%a %d-%m-%Y %I:%M %p}",
+        "format": "{:%a, %b %d %Y %I:%M %p %Z}",
         "tooltip-format": "<small>{calendar}</small>",
         "calendar": {
             "format": {
@@ -66,10 +116,10 @@
     },
 
     "wireplumber": {
-        "format": "{volume}% {icon}",
-        "format-muted": "Muted 󰝟",
-        "format-icons": ["", "", ""],
+        "format": "<span size='large'>󰕾</span> {volume}%",
+        "format-muted": "<span size='large'>󰝟</span> Muted",
         "on-click": "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle",
+        "on-click-right": "toggle-scratchpad audio",
         "on-scroll-up": "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+",
         "on-scroll-down": "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
     }