2 files changed, 39 insertions, 31 deletions

diff --git a/config/hyprland/waybar/config.jsonc b/config/hyprland/waybar/config.jsonc
index 006d22b..816a851 100644
--- a/config/hyprland/waybar/config.jsonc
+++ b/config/hyprland/waybar/config.jsonc
@@ -1,8 +1,8 @@
 {
 	"layer": "top",
-	"modules-left": ["battery", "wlr/workspaces", "mpd"],
+	"modules-left": ["battery", "clock", "wlr/workspaces", "mpd"],
 	"modules-center": ["hyprland/window"],
-	"modules-right": ["network", "pulseaudio", "temperature", "cpu", "custom/memory", "clock", "tray"],
+	"modules-right": ["network", "pulseaudio", "temperature", "cpu", "custom/memory", "tray"],
 	"wlr/workspaces": {
 		"on-click": "activate",
 	},
@@ -10,13 +10,15 @@
 		"tooltip": false,
 		"format": "{artist} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S})",
 		"artist-len": 24,
-		"format-disconnected": "ﳌ",
-		"format-stopped": "",
+		"format-disconnected": "",
+		"format-stopped": "",
 		"state-icons": {
-			"playing": "",
-			"paused": "",
+			"playing": "",
+			"paused": "",
 		},
 		"on-click": "mpc toggle",
+		"on-scroll-up": "mpc volume +5",
+		"on-scroll-down": "mpc volume -5",
 	},
 	"battery": {
 		"format-charging": " {capacity}%",
@@ -29,9 +31,9 @@
 	"pulseaudio": {
 		"tooltip": false,
 		"scroll-step": 5,
-		"format": "{icon} {volume}%",
+		"format": "{icon} {volume:3}%",
 		"format-icons": {
-			"default": ["奄", "奔", "墳"]
+			"default": ["", "", ""]
 		},
 		"on-click": "pavucontrol",
 	},
@@ -43,11 +45,11 @@
 		},
 	},
 	"network": {
-		"format-wifi": "",
+		"format-wifi": " ",
 		"tooltip-format-wifi": "{ifname} {essid}",
 		"format-ethernet": "",
 		"tooltip-format-ethernet": "{ifname} {ipaddr}",
-		"format-disconnected": "裏",
+		"format-disconnected": "",
 	},
 	"cpu": {
 		"tooltip": false,
@@ -61,7 +63,7 @@
 	},
 	"clock": {
 		"format": "{:%H:%M}",
-		"format-alt": " {:%A, %B %d, %Y (%R)}",
+		"format-alt": "{:(%R) %A %d %B}",
 		"interval": 1,
 	},
 	"tray": {
diff --git a/config/hyprland/waybar/schemes/base16.css b/config/hyprland/waybar/schemes/base16.css
index 68c5219..eced638 100644
--- a/config/hyprland/waybar/schemes/base16.css
+++ b/config/hyprland/waybar/schemes/base16.css
@@ -38,6 +38,7 @@ window#waybar.PCSX2 #window {
 }
 
 #mpd, #battery,
+#window,
 #network, #pulseaudio, #temperature, #cpu, #custom-memory {
 	margin-left: 8px;
 	padding-left: 16px;
@@ -45,8 +46,10 @@ window#waybar.PCSX2 #window {
 	border-radius: 26px;
 }
 
-#workspaces, #mpd, #battery,
-#network, #pulseaudio, #temperature, #cpu, #custom-memory, #workspaces, #clock, #tray {
+#workspaces, #mpd, #battery, #clock,
+#window,
+#network, #pulseaudio, #temperature, #cpu, #custom-memory, #tray {
+	border: solid @background 2px;
 	margin-top: 4px;
 	margin-bottom: 2px;
 	transition: none;
@@ -55,28 +58,29 @@ window#waybar.PCSX2 #window {
 #battery {
 	color: @color6;
 	background: @background;
+	border-color: @color4;
 }
 
 #workspaces {
 	margin-left: 12px;
 	border-radius: 26px;
-	background: @background;
+	background: @color3;
 }
 
 #workspaces button {
 	transition: none;
-	color: @foreground;
 	background: transparent;
 	font-size: 16px;
+	color: @background;
 }
 
 #workspaces button.active {
-	color: @color12;
+	text-shadow: 1px 0px 1px @background;
 }
 
 #workspaces button:hover {
 	transition: none;
-	color: @color11;
+	color: @color8;
 }
 
 #mpd {
@@ -88,56 +92,58 @@ window#waybar.PCSX2 #window {
 #mpd.stopped {
 	color: @foreground;
 	background: @background;
+	border-color: @color4;
 }
 
-#window {
+#clock {
 	margin-top: 4px;
 	margin-bottom: 2px;
 	margin-left: 8px;
 	padding-left: 16px;
 	padding-right: 16px;
 	border-radius: 26px;
-	color: @color6;
-	color: @color4;
+	color: @color3;
 	background: @background;
+	border-color: @color4;
+}
+
+#window {
+	color: @background;
+	background: @color4;
 }
 
 #network {
 	color: @background;
-	background: @color12;
+	background: @color5;
 }
 
 #pulseaudio {
 	color: @background;
-	background: @color14;
+	background: @color4;
 }
 
 #temperature {
 	color: @background;
-	background: @color7;
+	background: @color3;
 }
 
 #cpu {
 	color: @background;
-	background: @color3;
+	background: @color4;
 }
 
 #custom-memory {
-	color: @background;
-	background: @color2;
-}
-
-#clock {
 	margin-left: 8px;
 	margin-right: 12px;
 	padding-left: 16px;
 	padding-right: 16px;
 	border-radius: 26px;
-	color: @foreground;
-	background: @background;
+	color: @background;
+	background: @color5;
 }
 
 #tray {
+	border: none;
 	margin-right: 12px;
 	color: @foreground;
 	background: transparent;