more icons and cleanup with drawer modules

2 files changed, 85 insertions, 31 deletions

diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc
index 1a7d7da..cce3498 100644
--- a/.config/waybar/config.jsonc
+++ b/.config/waybar/config.jsonc
@@ -2,33 +2,34 @@
 	"layer": "top",
 	"position": "top",
 	"modules-left": [
-		"network",
-		"custom/vpn",
-		"custom/brightness"
+    "clock",
+		"sway/window"
 	],
 	"modules-center": [
 		"sway/workspaces"
 	],
 	"modules-right": [
-		"tray",
+		"group/tray-group",
+		"group/brightness-group",
+    "network",
+		"custom/vpn",
 		"pulseaudio",
 		"bluetooth",
-		"battery",
-		"clock"
+		"battery"
 	],
 	"sway/workspaces": {
 		"all-outputs": true,
 		"format": "{name}"
 	},
+	"sway/window": {
+	"format": "<span color='#aaaaaa'>{app_id} {title}</span>",
+	"max-length": 40
+	},
 	"clock": {
 		"format": "{:%a, %b %d/%m/%y %H:%M}",
 		"interval": 60,
 		"tooltip-format": "<big>{:%B %Y}</big>\n<tt>{calendar}</tt>"
 	},
-	"tray": {
-		"icon-size": 16,
-		"spacing": 4
-	},
 	"battery": {
 		"interval": 60,
 		"max-length": 25,
@@ -57,7 +58,8 @@
 				"󰂅"
 			]
 		},
-		"format-plugged": "󰚥 <span color='#aaaaaa'>{capacity}%</span>"
+		"format-plugged": "󰚥 <span color='#aaaaaa'>{capacity}%</span>",
+		"format-full": "󰚥 <span color='#aaaaaa'>{capacity}%</span>"
 	},
 	"bluetooth": {
 		"format": "󰂯 <span color='#aaaaaa'>{num_connections}</span>",
@@ -68,19 +70,25 @@
 		"on-click-right": "rfkill toggle bluetooth"
 	},
 	"pulseaudio": {
-		"format": "{icon} <span color='#aaaaaa'>{volume}</span>",
-		"format-bluetooth": "󰂯 <span color='#aaaaaa'>{volume}</span>",
-		"format-muted": "X MUTED",
-		"format-icons": [
-			"+---",
-			"++--",
-			"+++-",
-			"++++"
-		],
-		"on-click": "pavucontrol-qt",
-		"tooltip-format": "{desc}",
-		"scroll-step": 5
+	"format": "{icon} <span color='#aaaaaa'>{volume}%</span>",
+	"format-bluetooth": "{icon}  <span color='#aaaaaa'>{volume}%</span>",
+	"format-muted": "",
+	"format-icons": {
+			"alsa_output.pci-0000_00_1f.3.analog-stereo": "",
+			"alsa_output.pci-0000_00_1f.3.analog-stereo-muted": "",
+			"headphone": "",
+			"hands-free": "󰂑",
+			"headset": "󰂑",
+			"phone": "",
+			"phone-muted": "",
+			"portable": "",
+			"car": "",
+			"default": ["", ""]
 	},
+	"scroll-step": 5,
+	"tooltip-format": "{desc}",
+	"on-click": "pavucontrol-qt"
+  },
 	"network": {
 		"interface": "wlo1",
 		"format": "{ifname}",
@@ -90,7 +98,7 @@
 			"󰤥",
 			"󰤨"
 		],
-		"format-wifi": "{icon} {essid} <span color='#aaaaaa'>{signalStrength}%</span>",
+		"format-wifi": "{icon} <span color='#aaaaaa'>{signalStrength}%</span>",
 		"format-ethernet": " {ipaddr}/<span color='#aaaaaa'>{cidr}</span>",
 		"format-disconnected": "󰲛 DC'D",
 		"tooltip-format-wifi": "{icon} {essid} ({signalStrength}%)",
@@ -105,16 +113,62 @@
 		"format": " <span color='#aaaaaa'>{}</span>",
 		"exec": "~/.local/bin/waybar-vpn",
 		"return-type": "json",
-		"interval": 30
+		"interval": 30,
+		"signal": 9
+	},
+	// Brightness display
+	"group/brightness-group": {
+    "orientation": "horizontal",
+    "drawer": {
+        "transition-duration": 500,
+        "children-class": "brightness-child",
+        "transition-left-to-right": false
+    },
+    "modules": [
+			"custom/brightness-icon",
+			"backlight",
+			"custom/brightness"
+    ]
+	},
+	"backlight": {
+	"device": "intel_backlight",
+	"format": "{icon} {percent}%",
+	"tooltip-format": "Built-in: {percent}%",
+	"format-icons": ["", ""]
+	},
+	"custom/brightness-icon": {
+		"format": "",
+		"tooltip-format": ""
 	},
 	"custom/brightness": {
-		"format": "HDMI: <span color='#aaaaaa'>{}%</span>",
+		"format": "󰡁 <span color='#aaaaaa'>{}%</span>",
 		"interval": "once",
 		"signal": 9,
 		"exec": "~/.local/bin/waybar-brightness get",
 		"on-scroll-up": "~/.local/bin/waybar-brightness up",
 		"on-scroll-down": "~/.local/bin/waybar-brightness down",
 		"on-click": "~/.local/bin/waybar-brightness left_click",
-		"on-click-right": "~/.local/bin/waybar-brightness right_click"
+		"on-click-right": "~/.local/bin/waybar-brightness right_click",
+		"tooltip-format": "HDMI: {}%"
+	},
+	// Tray drawer group
+	"group/tray-group": {
+		"orientation": "horizontal",
+		"drawer": {
+			"transition-duration": 300,
+			"transition-left-to-right": true
+		},
+		"modules": [
+				"custom/tray-drawer",
+				"tray"
+		]
+	},
+	"custom/tray-drawer": {
+		"format": "",
+		"tooltip": false
+	},
+	"tray": {
+		"icon-size": 16,
+		"spacing": 4
 	}
 }
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index 18dbe68..21487b3 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -8,7 +8,6 @@
 
 window#waybar {
 	background-color: #0a0a0a;
-	/* color: #ffffff; */
 }
 
 #workspaces button {
@@ -21,7 +20,6 @@ window#waybar {
 }
 
 #workspaces button.focused {
-	/* background-color: #7fc8ff; */
 	color: #7fc8ff;
 	border-radius: 0;
 	border-bottom: solid 2px;
@@ -35,14 +33,16 @@ window#waybar {
 #clock,
 #battery,
 #window,
+#backlight,
+/* Custom modules */
 #custom-vpn,
-#custom-brightness,
+#custom-brightness-icon,
 #memory,
 #network,
 #mpris,
 #bluetooth,
 #pulseaudio,
-#tray {
+#tray-group {
 	padding: 0 8px;
 }