chore: icons and cleanup

2 files changed, 43 insertions, 22 deletions

diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc
index 4425aa8..1a7d7da 100644
--- a/.config/waybar/config.jsonc
+++ b/.config/waybar/config.jsonc
@@ -2,12 +2,13 @@
 	"layer": "top",
 	"position": "top",
 	"modules-left": [
-		"sway/workspaces",
 		"network",
 		"custom/vpn",
 		"custom/brightness"
 	],
-	"modules-center": [],
+	"modules-center": [
+		"sway/workspaces"
+	],
 	"modules-right": [
 		"tray",
 		"pulseaudio",
@@ -36,23 +37,39 @@
 			"warning": 30,
 			"critical": 15
 		},
-		"format": "BAT: <span color='#aaaaaa'>{capacity}%</span>",
+		"format": "{icon} <span color='#aaaaaa'>{capacity}%</span>",
 		"format-icons": {
-			"charging": "<span color='#ffff00'>PWR: {capacity}%</span>"
+			"default": [
+				"",
+				"",
+				"",
+				"",
+				""
+			],
+			"charging": [
+				"󰢜",
+				"󰂆",
+				"󰂇",
+				"󰂈",
+				"󰢝",
+				"󰂊",
+				"󰂋",
+				"󰂅"
+			]
 		},
-		"format-plugged": "PLG: <span color='#aaaaaa'>{capacity}%</span>"
+		"format-plugged": "󰚥 <span color='#aaaaaa'>{capacity}%</span>"
 	},
 	"bluetooth": {
-		"format": "BT: <span color='#aaaaaa'>{num_connections}</span>",
-		"format-disabled": "BT: <span color='#aaaaaa'>DC'D</span>",
-		"format-connected": "BT: <span color='#aaaaaa'>{num_connections}</span>",
+		"format": "󰂯 <span color='#aaaaaa'>{num_connections}</span>",
+		"format-disabled": "󰂲 <span color='#aaaaaa'>DC'D</span>",
+		"format-connected": "󰂯 <span color='#aaaaaa'>{num_connections}</span>",
 		"tooltip-format": "Devices connected: {num_connections}\n{device_alias} at {device_battery_percentage}%",
 		"on-click": "foot --app-id=TUI.float -e bluetui",
 		"on-click-right": "rfkill toggle bluetooth"
 	},
 	"pulseaudio": {
 		"format": "{icon} <span color='#aaaaaa'>{volume}</span>",
-		"format-bluetooth": "BT: {icon} <span color='#aaaaaa'>{volume}</span>",
+		"format-bluetooth": "󰂯 <span color='#aaaaaa'>{volume}</span>",
 		"format-muted": "X MUTED",
 		"format-icons": [
 			"+---",
@@ -67,19 +84,25 @@
 	"network": {
 		"interface": "wlo1",
 		"format": "{ifname}",
-		"format-wifi": "WiFi: {essid} <span color='#aaaaaa'>{signalStrength}%</span>",
-		"format-ethernet": "Eth: {ipaddr}/<span color='#aaaaaa'>{cidr}</span>",
-		"format-disconnected": "DC'D",
-		"tooltip-format-wifi": "{essid} ({signalStrength}%)",
-		"tooltip-format-ethernet": "{ifname} via {gwaddr}",
-		"tooltip-format-disconnected": "DC'D",
+		"format-icons": [
+			"󰤟",
+			"󰤢",
+			"󰤥",
+			"󰤨"
+		],
+		"format-wifi": "{icon} {essid} <span color='#aaaaaa'>{signalStrength}%</span>",
+		"format-ethernet": " {ipaddr}/<span color='#aaaaaa'>{cidr}</span>",
+		"format-disconnected": "󰲛 DC'D",
+		"tooltip-format-wifi": "{icon} {essid} ({signalStrength}%)",
+		"tooltip-format-ethernet": " {ifname} via {gwaddr}",
+		"tooltip-format-disconnected": "󰲛 DC'D",
 		"max-length": 50,
 		"interval": 60,
 		"on-click": "foot --app-id TUI.float -e wifitui",
 		"on-click-right": "rfkill toggle wlan"
 	},
 	"custom/vpn": {
-		"format": "VPN: <span color='#aaaaaa'>{}</span>",
+		"format": " <span color='#aaaaaa'>{}</span>",
 		"exec": "~/.local/bin/waybar-vpn",
 		"return-type": "json",
 		"interval": 30
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index 96b8bfd..18dbe68 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -1,7 +1,7 @@
 * {
 	border: none;
-	font-family: "IoskeleyMonoNL Nerd Font, monospace";
-	font-size: 12px;
+	font-family: "GeistMono Nerd Font Propo, monospace";
+	font-size: 11px;
 	/* font-weight: bold; */
 	min-height: 0;
 }
@@ -12,8 +12,7 @@ window#waybar {
 }
 
 #workspaces button {
-	padding: 3px 5px;
-	/* color: #ffffff; */
+	padding: 2px 3px;
 }
 
 #workspaces button:hover {
@@ -30,7 +29,6 @@ window#waybar {
 
 #workspaces button.urgent {
 	color: #f38ba8;
-	/* background: #ff0000; */
 	border-radius: 0;
 }
 
@@ -45,7 +43,7 @@ window#waybar {
 #bluetooth,
 #pulseaudio,
 #tray {
-	padding: 0 12px;
+	padding: 0 8px;
 }
 
 /* custom modules */