2 files changed, 29 insertions, 18 deletions

diff --git a/.config/waybar/config b/.config/waybar/config
index 9e3dfec..021492b 100644
--- a/.config/waybar/config
+++ b/.config/waybar/config
@@ -53,7 +53,8 @@
 	"format": "<small>/home </small>{percentage_used}%"
     },
     "cpu": {
-        "format": " {usage}%"
+        "format": " {}%",
+        "on-click": "$HOME/bin/swx -t -f htop"
     },
     "memory": {
         "format": " {}%"
@@ -65,7 +66,9 @@
     },
     "backlight": {
         "format": "{icon} {percent}%",
-        "format-icons": [""]
+        "format-icons": [""],
+        "on-scroll-down": "light -D 5",
+        "on-scroll-up": "light -U 5",
     },
     "battery": {
         "states": {
@@ -87,13 +90,16 @@
         "format-linked": " {ifname} (-)",
         "format-disconnected": " (-)",
         "tooltip-format": "{ifname}: {ipaddr}/{cidr}\nssid: {essid}\nsignal: {signaldBm} dbm",
-        "tooltip-format-disconnected": "disconnected"
+        "tooltip-format-disconnected": "disconnected",
+        "on-click": "$HOME/bin/swx -t -f iwctl"
     },
     "network#wg": {
         "interface": "wg0",
         "format": "",
 	"tooltip-format": "wg0: {ipaddr}/{cidr}",
-        "tooltip-format-disconnected": "disconnected"
+        "tooltip-format-disconnected": "disconnected",
+	"on-click": "swaymsg exec doas wg-quick up wg0",
+	"on-click-right": "swaymsg exec doas wg-quick down wg0"
     },
     "pulseaudio": {
         "format": "{icon} {volume}%",
@@ -111,7 +117,7 @@
             "default": ["", "", ""]
         },
         "on-click-right": "pactl set-sink-mute @DEFAULT_SINK@ toggle",
-        "on-click": "pavucontrol"
+        "on-click": "swaymsg exec soundswitch"
     },
     "custom/media": {
         "format": "{icon} {}",
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index 6fbbb03..6db3013 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -98,29 +98,25 @@ window#waybar.solo {}
   color: @dimmed;
 }
 
-#disk.root {
-  margin-right: 0;
-  padding-right: 0;
-}
+#disk.root {}
 #disk.home {
+  margin-left: 0;
+  padding-left: 0;
 }
 
-#battery {
-}
+#battery {}
 #battery.charging {
   color: @foreground;
-  background-color: #26a65b;
+  background: #26a65b;
 }
-
 @keyframes blink {
   to {
-    background-color: @foreground;
+    background: @foreground;
     color: @background;
   }
 }
-
 #battery.critical:not(.charging) {
-  background-color: #f53c3c;
+  background: #f53c3c;
   color: @foreground;
   animation-name: blink;
   animation-duration: 0.5s;
@@ -138,11 +134,20 @@ label:focus {
 #backlight {}
 #network {}
 #network.disconnected {
+  border-top: 2px solid @urgent;
   color: @dimmed;
 }
-#pulseaudio {
+#network.wg.disconnected {
+  border-top: 2px solid @dimmeddarker;
 }
+#network.wg:not(.disconnected) {
+  border-top: 2px solid #c476ff;
+  /* background: #c476ff; */
+  /* color: @dimmeddarker; */
+}
+#pulseaudio {}
 #pulseaudio.muted {
+  border-top: 2px solid @urgent;
   color: @dimmed;
 }
 
@@ -175,7 +180,7 @@ label:focus {
 
 #custom-toggl {
   color: @foreground;
-  /* background-color: #DB4D6D; */
+  /* background: #DB4D6D; */
   border-top: 2px solid #DB4D60;
 }