fix: lessen the dependence on nerd fonts

2 files changed, 155 insertions, 136 deletions

diff --git a/waybar/config.jsonc b/waybar/config.jsonc
index ef42848..85c365a 100644
--- a/waybar/config.jsonc
+++ b/waybar/config.jsonc
@@ -1,133 +1,149 @@
 {
-	"layer": "top",
-	"position": "top",
-	"modules-left": [
-		"clock",
-		"custom/uptime",
-		"niri/window"
-	],
-	"modules-center": [
-		"custom/workspaces"
-	],
-	"modules-right": [
-		"custom/screenrecording-indicator",
-		"tray",
-		"custom/brightness",
-		"network",
-		"custom/vpn",
-		"pulseaudio",
-		"bluetooth",
-		"battery"
-	],
-	"niri/window": {
-		"format": "{app_id} | {title}",
-		"max-length": 30
-	},
-	"clock": {
-		"format": "{:%a, %b %d %H:%M}",
-		"tooltip": false
-	},
-	"battery": {
-		"interval": 60,
-		"max-length": 25,
-		"states": {
-			"good": 95,
-			"warning": 30,
-			"critical": 15
-		},
-		"format": "{icon} {capacity}%",
-		"format-icons": {
-			"default": [
-				"",
-				"",
-				"",
-				"",
-				""
-			],
-			"charging": "<span color='#ffff00'></span>"
-		},
-		"format-plugged": " {capacity}%"
-	},
-	"bluetooth": {
-		"format": " {num_connections}",
-		"format-disabled": "<span color='#aaaaaa'>󰂲</span>",
-		"format-connected": " {num_connections}",
-		"tooltip-format": "Devices connected: {num_connections}\n{device_alias} at {device_battery_percentage}%",
-		"on-click": "$TERMINAL --app-id=TUI.float -e bluetui",
-		"on-click-right": "rfkill toggle bluetooth"
-	},
-	"pulseaudio": {
-		"format": "{icon} {volume}%",
-		"format-bluetooth": " {icon} {volume}%",
-		"format-muted": "",
-		"format-icons": {
-			"alsa_output.pci-0000_00_1f.3.analog-stereo": "",
-			"alsa_output.pci-0000_00_1f.3.analog-stereo-muted": "",
-			"headphone": "",
-			"phone": "",
-			"phone-muted": "",
-			"portable": "",
-			"car": "",
-			"default": [
-				"",
-				""
-			]
-		},
-		// "on-click": "$TERMINAL --app-id=TUI.float -e wiremix",
-		"on-click": "pavucontrol",
-		"tooltip-format": "{desc}",
-		"scroll-step": 5
-	},
-	"network": {
-		"interface": "wlan0",
-		"format": "{ifname}",
-		"format-wifi": " {signalStrength}%",
-		"format-ethernet": " {ipaddr}/{cidr}",
-		"format-disconnected": "󰖪", //An empty format will hide the module.
-		"tooltip-format": " {ifname} via {gwaddr}",
-		"tooltip-format-wifi": " {essid} {signalStrength}%",
-		"tooltip-format-ethernet": "{ifname}",
-		"tooltip-format-disconnected": "󰖪",
-		"max-length": 50,
-		"interval": 60,
-		"on-click": "$TERMINAL --app-id TUI.float -e wifitui",
-		"on-click-right": "rfkill toggle wlan"
-	},
-	"custom/vpn": {
-		"format": " VPN",
-		"exec": "echo '{\"class\": \"connected\"}'",
-		"exec-if": "test -d /proc/sys/net/ipv4/conf/proton0",
-		"return-type": "json",
-		"interval": 5
-	},
-	"custom/workspaces": {
-		"exec": "~/.config/waybar/niri-workspaces",
-		"return-type": "json",
-		"format": "{}"
-	},
-	// The below module require `ddcutil` to be working on the system
-	// or it will not work
-	"custom/brightness": {
-		"format": "☀ {}%",
-		"tooltip-format": "EXT: ☀ {}%",
-		"interval": "once",
-		"signal": 9,
-		"exec": "~/.config/waybar/brightness get",
-		"on-scroll-up": "~/.config/waybar/brightness up",
-		"on-scroll-down": "~/.config/waybar/brightness down",
-		"on-click": "~/.config/waybar/brightness left_click",
-		"on-click-right": "~/.config/waybar/brightness right_click"
-	},
-	"custom/screenrecording-indicator": {
-		"on-click": "~/.local/bin/screenrecord",
-		"exec": "~/.config/waybar/waybar-screenrecord",
-		"signal": 8,
-		"return-type": "json"
-	},
-	"custom/uptime": {
-		"format": "{}",
-		"interval": 1600,
-		"tooltip": false,
-		"exec": "~/.config/waybar/uptime"
-	}
+  "layer": "top",
+  "position": "top",
+  "modules-left": [
+    "clock",
+    // "custom/uptime",
+    // "niri/window"
+    "network",
+    "custom/vpn",
+  ],
+  "modules-center": ["custom/workspaces"],
+  "modules-right": [
+    "custom/screenrecording-indicator",
+    "tray",
+    "custom/brightness",
+    // "network",
+    // "custom/vpn",
+    "pulseaudio",
+    "bluetooth",
+    "battery",
+  ],
+  "niri/window": {
+    "format": "{app_id} | {title}",
+    "max-length": 30,
+  },
+  "clock": {
+    "format": "{:%a, %b %d %H:%M}",
+    "tooltip": false,
+  },
+  "battery": {
+    "interval": 60,
+    "max-length": 25,
+    "states": {
+      "good": 95,
+      "warning": 30,
+      "critical": 15,
+    },
+    // "format": "{icon} {capacity}%",
+    "format": "BAT: {capacity}%",
+    "format-icons": {
+      // "default": [
+      // 	"",
+      // 	"",
+      // 	"",
+      // 	"",
+      // 	""
+      // ],
+      // "charging": "<span color='#ffff00'></span>"
+      // no nerd font support font
+      "charging": "<span color='#ffff00'>PWR: {capacity}%</span>",
+    },
+    // "format-plugged": " {capacity}%"
+    "format-plugged": "PLG: {capacity}%",
+  },
+  "bluetooth": {
+    // "format": " {num_connections}",
+    "format": "BT: {num_connections}",
+    // "format-disabled": "<span color='#aaaaaa'>󰂲</span>",
+    "format-disabled": "<span color='#aaaaaa'>BT: DC'D</span>",
+    // "format-connected": " {num_connections}",
+    "format-connected": "BT: {num_connections}",
+    "tooltip-format": "Devices connected: {num_connections}\n{device_alias} at {device_battery_percentage}%",
+    "on-click": "$TERMINAL --app-id=TUI.float -e bluetui",
+    "on-click-right": "rfkill toggle bluetooth",
+  },
+  "pulseaudio": {
+    // "format": "{icon} {volume}%",
+    "format": "{icon} <span color='#aaaaaa'>{volume}</span>",
+    // "format-bluetooth": " {icon} {volume}%",
+    "format-bluetooth": "BT: {icon} {volume}",
+    // "format-muted": "",
+    "format-muted": "X MUTED",
+    "format-icons": ["+--", "++-", "+++"],
+    // "format-icons": {
+    // 	"alsa_output.pci-0000_00_1f.3.analog-stereo": "",
+    // 	"alsa_output.pci-0000_00_1f.3.analog-stereo-muted": "",
+    // 	"headphone": "",
+    // 	"phone": "",
+    // 	"phone-muted": "",
+    // 	"portable": "",
+    // 	"car": "",
+    // 	"default": [
+    // 		"",
+    // 		""
+    // 	]
+    // },
+    "on-click": "$TERMINAL --app-id=TUI.float -e wiremix",
+    "tooltip-format": "{desc}",
+    "scroll-step": 5,
+  },
+  "network": {
+    "interface": "wlan0",
+    "format": "{ifname}",
+    // "format-wifi": " {signalStrength}%",
+    "format-wifi": "WiFi: {essid} <span color='#aaaaaa'>{signalStrength}%</span>",
+    "format-ethernet": "Eth: {ipaddr}/<span color='#aaaaaa'>{cidr}</span>",
+    // "format-ethernet": " {ipaddr}/{cidr}",
+    // "format-disconnected": "󰖪", //An empty format will hide the module.
+    "format-disconnected": "DC'D",
+    // "tooltip-format-wifi": " {essid} {signalStrength}%",
+    "tooltip-format-wifi": "{essid} ({signalStrength}%)",
+    "tooltip-format-ethernet": "{ifname} via {gwaddr}",
+    // "tooltip-format-disconnected": "󰖪",
+    "tooltip-format-disconnected": "DC'D",
+    "max-length": 50,
+    "interval": 60,
+    "on-click": "$TERMINAL --app-id TUI.float -e wifitui",
+    "on-click-right": "rfkill toggle wlan",
+  },
+  "custom/vpn": {
+    // "format": " VPN",
+    "format": "VPN",
+    "exec": "echo '{\"class\": \"connected\"}'",
+    "exec-if": "test -d /proc/sys/net/ipv4/conf/proton0",
+    "return-type": "json",
+    "interval": 5,
+  },
+  "custom/workspaces": {
+    "exec": "~/.config/waybar/niri-workspaces",
+    "return-type": "json",
+    "format": "{}",
+  },
+  // The below module require `ddcutil` to be working on the system
+  // or it will not work
+  "custom/brightness": {
+    // "format": "☀ {}%",
+    "format": "HDMI: {}",
+    // "tooltip-format": "☀ {}%",
+    "interval": "once",
+    "signal": 9,
+    "exec": "~/.config/waybar/brightness get",
+    "on-scroll-up": "~/.config/waybar/brightness up",
+    "on-scroll-down": "~/.config/waybar/brightness down",
+    "on-click": "~/.config/waybar/brightness left_click",
+    "on-click-right": "~/.config/waybar/brightness right_click",
+  },
+  "custom/screenrecording-indicator": {
+    "on-click": "~/.local/bin/screenrecord",
+    "exec": "~/.config/waybar/waybar-screenrecord",
+    "signal": 8,
+    "return-type": "json",
+  },
+  "custom/uptime": {
+    "format": "{}",
+    "interval": 1600,
+    "tooltip": false,
+    "exec": "~/.config/waybar/uptime",
+  },
 }
diff --git a/waybar/style.css b/waybar/style.css
index 61f4baf..f3f6ed2 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -1,13 +1,14 @@
 * {
 	border: none;
-	font-family: "Terminess Nerd Font Propo, monospace";
-	font-size: 16px;
-	/* font-weight: bold; */
+	/* font-family: "Terminess Nerd Font Propo, monospace"; */
+	font-family: "IoskeleyMonoNL Nerd Font, monospace";
+	font-size: 14px;
+	font-weight: bold;
 	min-height: 0;
 }
 
 window#waybar {
-	background-color: alpha(#0a0a0a, 0.7);
+	background-color: alpha(#0a0a0a, 0.8);
 }
 
 #battery {
@@ -35,7 +36,7 @@ window#waybar {
 #bluetooth,
 #pulseaudio,
 #tray {
-	padding: 0 8px;
+	padding: 0 12px;
 }
 
 /* add grey color to some modules */
@@ -46,6 +47,8 @@ window#waybar {
 #custom-brightness,
 #custom-uptime,
 #custom-vpn,
+#clock,
+#window,
 #battery {
 	color: #cccccc;
 	/* color: #9b8ec4; */