diff --git a/.config/waybar/config.jsonc##hostname.cn-arch b/.config/waybar/config.jsonc##hostname.cn-arch
index 107fa8d..d6b0333 100644
--- a/.config/waybar/config.jsonc##hostname.cn-arch
+++ b/.config/waybar/config.jsonc##hostname.cn-arch
@@ -1,7 +1,11 @@
 {
   // general bar settings
   "layer": "bottom",
-  "output": ["DP-1", "DP-2", "!HDMI-A-2"],
+  "output": [
+    "DP-1",
+    "DP-2",
+    "!HDMI-A-2"
+  ],
   "position": "bottom",
   "mod": "dock",
   "exclusive": true,
@@ -9,8 +13,13 @@
   "passthrough": false,
   "height": 32,
   // which modules to show
-  "modules-left": ["hyprland/workspaces"],
-  "modules-center": ["mpris", "privacy"],
+  "modules-left": [
+    "hyprland/workspaces"
+  ],
+  "modules-center": [
+    "mpris",
+    "privacy"
+  ],
   "modules-right": [
     "cpu",
     "memory",
@@ -38,13 +47,11 @@
     "interval": 10,
     "format": "<span color=\"#4F84CC\"></span>  <span color=\"#CAD3E8\">{percentage}%</span>",
     "tooltip": true,
-    "tooltip-format": "<span color=\"#CAD3E8\">RAM: {used:.1f}GiB / {total:.1f}GiB</span>",
   },
   "disk": {
     "interval": 30,
     "format": "<span color=\"#4F84CC\">󰋊</span>  <span color=\"#CAD3E8\">{percentage_used}%</span>",
     "tooltip": true,
-    "tooltip-format": "<span color=\"#CAD3E8\">Avail: {free} / {total}</span>",
   },
   "network": {
     // only show the Wi-Fi glyph on wifi…
@@ -52,6 +59,7 @@
     // …and this little link-icon on Ethernet
     "format-ethernet": "<span color=\"#4F84CC\"></span>  <span color=\"#CAD3E8\">{ifname}</span>",
     "format-disconnected": "<span color=\"#FFCC33\">󰌙  Disconnected</span>",
+    "tooltip": true,
     "tooltip-format": "<span color=\"#CAD3E8\">{ifname} via {gwaddr}</span>",
   },
   "pulseaudio": {
@@ -65,7 +73,10 @@
       "alsa_output.usb-SteelSeries_Arctis_7_-00.analog-stereo": "", // SteelSeries headset
       "alsa_output.pci-0000_0a_00.4.iec958-stereo": "", // speaker icon for your soundbar
       "bluez_output.50_5E_5C_2D_F3_B2.1": "", // Bluetooth earbud icon
-      "default": ["", ""], // fallback (low/hi)
+      "default": [
+        "",
+        ""
+      ], // fallback (low/hi)
     },
   },
   "bluetooth": {
@@ -93,6 +104,7 @@
     "return-type": "json",
     "interval": 10,
     "format": "<span color=\"#4F84CC\">{text}</span>",
+    "tooltip": true,
   },
   "tray": {
     "icon-size": 18,
diff --git a/.config/waybar/scripts/razer_basilisk_v3_pro_battery_info.sh b/.config/waybar/scripts/razer_basilisk_v3_pro_battery_info.sh
index 6963675..14b5019 100755
--- a/.config/waybar/scripts/razer_basilisk_v3_pro_battery_info.sh
+++ b/.config/waybar/scripts/razer_basilisk_v3_pro_battery_info.sh
@@ -2,7 +2,13 @@
 
 # Path to your Razer HID battery info
 #BASE="/sys/bus/hid/drivers/razermouse/0003:1532:00AB.000A"
-BASE_MOUSE="/sys/devices/pci0000:00/0000:00:01.2/0000:02:00.0/usb1/1-8/1-8.1/1-8.1.2/1-8.1.2:1.0/0003:1532:00AB.0009"
+#BASE_MOUSE="/sys/devices/pci0000:00/0000:00:01.2/0000:02:00.0/usb1/1-8/1-8.1/1-8.1.2/1-8.1.2:1.0/0003:1532:00AB.0009"
+BASE_MOUSE=''
+
+# autodetect the razermouse sysfs folder that contains charge_level
+for d in /sys/bus/hid/drivers/razermouse/*; do
+  [[ -f $d/charge_level ]] && { BASE_MOUSE=$d; break; }
+done
 
 # Read raw level and charging status
 raw=$(cat "$BASE_MOUSE/charge_level")