hopefully done for a while

waybar/config.jsonc

@@ -1,34 +1,27 @@
 {
 	"margin":4,
-	"modules-left":[
-		"sway/workspaces",
-		"sway/mode"
-	],
-	"modules-center":[
-		"mpris"
-	],
-	"modules-right":[
-		"privacy",
-		"network#warp",
-		"network#wifi",
-		"wireplumber",
-		"backlight",
-		"battery",
-		"clock",
-		"tray"
-	],
+	"modules-left":["sway/workspaces","sway/mode"],
+	"modules-center":["mpris"],
+	"modules-right":["privacy","network#warp","network#wifi","wireplumber","backlight","battery","clock","tray"],
 	"sway/workspaces":{
-		"all-outputs":true
+		"format":"{name} {windows}",
+		"format-window-separator":" | ",
+		"window-format":"{name}",
+		"window-rewrite-default":"{name}",
+		"window-rewrite":{
+			"class<foot>":"",
+			"class<firefox>":"",
+			"class<chromium>":"",
+			"class<signal>":"",
+			"class<calibre-gui>":"Calibre",
+			"class<org.wireshark.Wireshark>":"Wireshark"
+		}
 	},
 	"mpris":{
 		"interval":1,
-		"dynamic-order":["title","artist","album"],
-		"format":"{dynamic} ({position}/{length})",
+		"format":"{dynamic}",
 		"tooltip":false
 	},
-	"privacy":{
-		"modules": [{"type": "audio-in"}]
-	},
 	"network#warp":{
 		"interval":5,
 		"format":"warp ",
@@ -38,7 +31,7 @@
 	},
 	"network#wifi":{
 		"interval":5,
-		"format-wifi":"{essid} ({signalStrength}%) ",
+		"format":"{essid} ({signalStrength}%) ",
 		"format-disconnected":"no wifi",
 		"tooltip-format":"{ipaddr}",
 		"interface":"wlan0"
@@ -67,7 +60,20 @@
 	"clock":{
 		"interval":1,
 		"format":"{:}",
-		"tooltip":false
+		"tooltip-format":"{calendar}",
+		"calendar":{
+			"mode-mon-col":4,
+			"weeks-pos":"right",
+			"format":{
+				"weeks":"W{}",
+				"today":"<span color='olivedrab'>{}</span>"
+			}
+		},
+		"actions":{
+			"on-click":"mode",
+			"on-click-right":"shift_up",
+			"on-click-middle":"shift_down"
+		}
 	},
 	"tray":{
 		"spacing":10

waybar/style.css

@@ -1,6 +1,4 @@
-* {
-	font: bold 14px monospace;
-}
+*{font-family:monospace;}
 
 window#waybar {
 	background-color: transparent;
@@ -14,15 +12,10 @@ window#waybar {
 	margin: 0 2px;
 }
 
-#workspaces button.focused {
-	background-color: darkslategrey;
-	color: white;
-}
-
-#workspaces button.urgent, #battery.warning {
-	background-color: firebrick;
-}
-
-#battery.charging {
+#workspaces button.focused, #battery.charging {
 	background-color: olivedrab;
 }
+
+#workspaces button.urgent, #battery.warning:not(.charging) {
+	background-color: firebrick;
+}