2 files changed, 169 insertions, 50 deletions

diff --git a/dotfiles/hyprland/.config/waybar/config b/dotfiles/hyprland/.config/waybar/config
index 3b3a90f..c7cc0a7 100644
--- a/dotfiles/hyprland/.config/waybar/config
+++ b/dotfiles/hyprland/.config/waybar/config
@@ -3,48 +3,124 @@
     "position": "top",
     "height": 30,
     "spacing": 4,
+    "margin-top": 6,
+    "margin-left": 10,
+    "margin-right": 10,
 
-    "modules-left": ["hyprland/workspaces"],
-    "modules-center": ["hyprland/window"],
-    "modules-right": ["tray", "battery", "disk", "clock"],
+    "modules-left": [
+        "hyprland/workspaces",
+        "custom/layout",
+        "hyprland/window"
+    ],
+    "modules-center": [],
+    "modules-right": [
+        "group/sysmonitor",
+        "custom/netspeed",
+        "wireplumber",
+        "tray",
+        "clock"
+    ],
+
+    "group/sysmonitor": {
+        "orientation": "horizontal",
+        "modules": [
+            "cpu",
+            "temperature",
+            "memory",
+            "disk",
+            "battery"
+        ]
+    },
 
     "hyprland/workspaces": {
+        "disable-scroll": true,
+        "all-outputs": true,
         "format": "{name}",
-        "on-click": "activate",
         "sort-by-number": true
     },
 
+    "custom/layout": {
+        "exec": "waybar-layout",
+        "return-type": "json",
+        "interval": 1,
+        "on-click": "cycle-layout"
+    },
+
     "hyprland/window": {
-        "format": "{}",
-        "max-length": 50
+        "max-length": 50,
+        "separate-outputs": true
     },
 
-    "tray": {
-        "spacing": 10
+    "cpu": {
+        "interval": 10,
+        "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": "<span size='large'>󰘚</span> {}%",
+        "on-click": "toggle-scratchpad monitor"
+    },
+
+    "disk": {
+        "interval": 30,
+        "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": {
-        "bat": "BAT0",
         "interval": 30,
         "states": {
             "warning": 30,
             "critical": 15
         },
-        "format": "󱊣 {capacity}% {icon}",
-        "format-charging": "󱊣 {capacity}% ",
-        "format-plugged": "󱊣 {capacity}% ",
-        "format-icons": ["", "", "", "", ""]
+        "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}"
     },
 
-    "disk": {
-        "interval": 30,
-        "format": " {used}/{total}",
-        "path": "/"
+    "tray": {
+        "icon-size": 22,
+        "spacing": 10
     },
 
     "clock": {
-        "interval": 30,
-        "format": " {:%a %B %d}  󰥔 {:%I:%M %p %Z}",
-        "tooltip-format": "<tt>{calendar}</tt>"
+        "format": "{:%a, %b %d %Y %I:%M %p %Z}",
+        "tooltip-format": "<small>{calendar}</small>",
+        "calendar": {
+            "format": {
+                "today": "<span color='#daa520'><b><u>{}</u></b></span>"
+            }
+        }
+    },
+
+    "wireplumber": {
+        "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%-"
     }
 }
diff --git a/dotfiles/hyprland/.config/waybar/style.css b/dotfiles/hyprland/.config/waybar/style.css
index 9411b46..4bd0052 100644
--- a/dotfiles/hyprland/.config/waybar/style.css
+++ b/dotfiles/hyprland/.config/waybar/style.css
@@ -1,61 +1,104 @@
-/* Waybar style - matching DWM colors */
-/* gray1=#222222, gray2=#444444, gray3=#bbbbbb, gray4=#eeeeee, accent=#daa520 */
+/* Waybar style - Dupre theme */
+/* Warm, earthy colors from dupre-theme.el */
 
 * {
-    font-family: "FiraCode Nerd Font Mono", monospace;
-    font-size: 12px;
     border: none;
     border-radius: 0;
+    font-size: 14px;
     min-height: 0;
+    font-family: "BerkeleyMono Nerd Font", "Berkeley Mono", monospace;
 }
 
 window#waybar {
-    background-color: #222222;
-    color: #bbbbbb;
+    background: transparent;
 }
 
-#workspaces button {
-    padding: 0 8px;
-    color: #bbbbbb;
-    background-color: transparent;
+#workspaces {
+    padding: 0.2rem;
 }
 
-#workspaces button:hover {
-    background-color: #444444;
+#workspaces button {
+    padding: 0.5rem;
+    margin: 0.2rem;
+    background-color: transparent;
+    color: #969385;
+    border-radius: 1rem;
+    transition: all 0.3s ease;
 }
 
 #workspaces button.active {
-    color: #eeeeee;
-    background-color: #daa520;
+    background: #d7af5f;
+    color: #151311;
+    border-radius: 1rem;
 }
 
 #workspaces button.urgent {
-    background-color: #900000;
+    background-color: rgba(212, 124, 89, 0.4);
 }
 
-#window {
-    color: #bbbbbb;
-    padding: 0 10px;
+.modules-right, .modules-left {
+    background-color: #151311;
+    border-radius: 1rem;
+    padding: 0.2rem 0.6rem;
+    margin: 0.3rem;
+    border: 0.095rem solid #d7af5f;
+    box-shadow: 0rem 0.2rem 0.4rem rgba(0,0,0,0.5);
 }
 
-#clock,
-#battery,
+#cpu,
+#temperature,
+#memory,
 #disk,
-#tray {
-    padding: 0 10px;
-    color: #bbbbbb;
+#custom-netspeed,
+#battery,
+#wireplumber,
+#tray,
+#clock,
+#custom-layout,
+#window {
+    padding: 0.4rem;
+    margin: 0.3rem;
+    color: #969385;
+    background-color: transparent;
+    border-radius: 1rem;
+}
+
+#sysmonitor {
+    margin: 0.3rem;
+    background-color: transparent;
+    border-radius: 1rem;
+}
+
+#cpu:hover,
+#temperature:hover,
+#memory:hover,
+#disk:hover,
+#custom-netspeed:hover,
+#wireplumber:hover,
+#sysmonitor:hover,
+#custom-layout:hover {
+    background-color: #474544;
+    border-radius: 1rem;
+}
+
+#clock {
+    color: #f0fef0;
+}
+
+#wireplumber {
+    color: #969385;
 }
 
-#battery.charging {
-    color: #daa520;
+#wireplumber.muted {
+    color: #58574e;
 }
 
-#battery.warning:not(.charging) {
-    color: #f0ad4e;
+#battery.warning {
+    color: #d7af5f;
 }
 
-#battery.critical:not(.charging) {
-    color: #d9534f;
+#battery.critical {
+    color: #d47c59;
 }
 
 #tray > .passive {
@@ -64,5 +107,5 @@ window#waybar {
 
 #tray > .needs-attention {
     -gtk-icon-effect: highlight;
-    background-color: #daa520;
+    background-color: #d7af5f;
 }