2 files changed, 36 insertions, 44 deletions

diff --git a/config/hyprland/waybar/config.jsonc b/config/hyprland/waybar/config.jsonc
index aadc6d3..6866f62 100644
--- a/config/hyprland/waybar/config.jsonc
+++ b/config/hyprland/waybar/config.jsonc
@@ -1,21 +1,18 @@
 {
 	"layer": "top",
-	"modules-left": ["battery", "clock", "wlr/workspaces", "mpd"],
-	"modules-center": ["hyprland/window"],
+	"modules-left": ["battery", "hyprland/workspaces", "mpd", "hyprland/window"],
+	"modules-center": ["clock"],
 	"modules-right": ["custom/wireguard", "network", "pulseaudio", "temperature", "cpu", "custom/memory", "tray"],
-	"wlr/workspaces": {
-		"on-click": "activate",
-	},
 	"mpd": {
-		"tooltip": false,
 		"format": "{artist} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S})",
 		"artist-len": 24,
-		"format-disconnected": "",
+		"format-disconnected": "s",
 		"format-stopped": "",
 		"state-icons": {
 			"playing": "",
 			"paused": "",
 		},
+		"tooltip-format": "{songPosition}/{queueLength} ({volume}%)",
 		"on-click": "mpc toggle",
 		"on-scroll-up": "mpc volume +5",
 		"on-scroll-down": "mpc volume -5",
@@ -29,7 +26,6 @@
 		"separate-outputs": true,
 	},
 	"pulseaudio": {
-		"tooltip": false,
 		"scroll-step": 5,
 		"format": "{icon} {volume:3}%",
 		"format-icons": {
@@ -57,7 +53,6 @@
 		"format-disconnected": "",
 	},
 	"cpu": {
-		"tooltip": false,
 		"format": " {usage:2}%",
 		"interval": 3,
 	},
@@ -67,8 +62,8 @@
 		"restart-interval": 3,
 	},
 	"clock": {
-		"format": "{:%H:%M}",
-		"format-alt": "{:(%R) %A %d %B}",
+		"format": "{:%R}",
+		"format-alt": "{:(%T) %A %d %B}",
 		"interval": 1,
 	},
 	"tray": {
diff --git a/config/hyprland/waybar/schemes/base16.css b/config/hyprland/waybar/schemes/base16.css
index 19bb703..76efbb3 100644
--- a/config/hyprland/waybar/schemes/base16.css
+++ b/config/hyprland/waybar/schemes/base16.css
@@ -29,6 +29,12 @@ window#waybar.hidden {
 	opacity: 0.2;
 }
 
+tooltip {
+	background: @background;
+	color: @foreground;
+	border: 2px solid @color0;
+}
+
 window#waybar.termite #window,
 window#waybar.Firefox #window,
 window#waybar.Navigator #window,
@@ -37,19 +43,21 @@ window#waybar.PCSX2 #window {
 	background: @color7;
 }
 
-#mpd, #battery,
-#window,
-#custom-wireguard, #network, #pulseaudio, #temperature, #cpu, #custom-memory {
-	margin-left: 8px;
-	padding-left: 16px;
-	padding-right: 16px;
-	border-radius: 26px;
+.modules-right * {
+	padding: 0 16px;
+}
+
+.modules-right {
+	margin-right: 2px;
+}
+.modules-left {
+	margin-left: 2px;
 }
 
 #workspaces, #mpd, #battery, #clock,
-#window,
 #custom-wireguard, #network, #pulseaudio, #temperature, #cpu, #custom-memory, #tray {
-	border: solid @background 2px;
+	border: solid @background;
+	border-width: 2px 2px 2px 0;
 	margin-top: 4px;
 	margin-bottom: 2px;
 	transition: none;
@@ -62,20 +70,18 @@ window#waybar.PCSX2 #window {
 }
 
 #workspaces {
-	margin-left: 12px;
-	border-radius: 26px;
+	border: solid @background 2px;
 	background: @color3;
 }
 
 #workspaces button {
 	transition: none;
 	background: transparent;
-	font-size: 16px;
 	color: @background;
 }
 
 #workspaces button.active {
-	text-shadow: 1px 0px 1px @background;
+	text-shadow: 0px 1px 0px @color1;
 }
 
 #workspaces button:hover {
@@ -85,6 +91,7 @@ window#waybar.PCSX2 #window {
 
 #mpd {
 	color: @background;
+	padding: 0 16px;
 	background: @color6;
 }
 
@@ -96,30 +103,27 @@ window#waybar.PCSX2 #window {
 }
 
 #clock {
-	margin-top: 4px;
-	margin-bottom: 2px;
-	margin-left: 8px;
-	padding-left: 16px;
-	padding-right: 16px;
-	border-radius: 26px;
+	border: solid @color4 2px;
+	padding: 0 16px;
 	color: @color3;
 	background: @background;
-	border-color: @color4;
 }
 
 #window {
-	color: @background;
-	background: @color4;
+	margin-left: 16px;
+	padding: 0;
+	color: @color5;
 }
 
 #custom-wireguard {
 	color: @color5;
-	border-color: @color8;
+	border: 2px solid @color8;
 	background: @background;
 }
 
 #network {
 	color: @background;
+	border-left: 2px solid @background;
 	background: @color5;
 }
 
@@ -139,20 +143,13 @@ window#waybar.PCSX2 #window {
 }
 
 #custom-memory {
-	margin-left: 8px;
-	margin-right: 12px;
-	padding-left: 16px;
-	padding-right: 16px;
-	border-radius: 26px;
+	padding: 0 16px;
 	color: @background;
 	background: @color5;
 }
 
-#tray {
-	border: none;
-	margin-right: 12px;
-	color: @foreground;
-	background: transparent;
+#tray * {
+	padding: unset;
 }
 
 #tray > .needs-attention {