2 files changed, 31 insertions, 23 deletions

diff --git a/config/linux/waybar/config b/config/linux/waybar/config
index d8cefd2..17bade2 100644
--- a/config/linux/waybar/config
+++ b/config/linux/waybar/config
@@ -22,9 +22,9 @@
         },
         "temperature": {
             "critical-threshold": 80,
-            "format": "{icon} {temperatureC}°C",
+            "format": "{icon}",
             "format-icons": ["", "", "", "", ""],
-            "tooltip": false
+            "tooltip-format": "Temperature:  {temperatureC}°C"
         },
         "battery#bat1": {
             "bat": "BAT0",
@@ -38,38 +38,30 @@
                 "1": 20,
                 "0": 5
             },
-            "format": "{icon} {capacity}%",
-            "format-charging-5": " {capacity}%",
-            "format-charging-4": " {capacity}%",
-            "format-charging-3": " {capacity}%",
-            "format-charging-2": " {capacity}%",
-            "format-charging-1": " {capacity}%",
-            "format-charging-0": " {capacity}%",
-            "format-icons": ["", "", "", "", "", ""]
+            "format": "{icon}",
+            "format-charging": "",
+            "format-icons": ["", "", "", "", ""],
+            "tooltip-format": "Battery: {capacity}%\n{timeTo}"
         },
         "network#wifi": {
             "interface": "wlp*",
             "format-ethernet": "",
-            "format-wifi": "  {signalStrength}%",
+            "format-wifi": "",
             "format-linked": "",
             "format-disconnected": "",
-            "tooltip-format": "{essid}\n{ifname}: {ipaddr}/{cidr}",
-            "on-click": "nm-connection-editor"
+            "tooltip-format": "Signal: {signalStrength}%\n{essid}\n{ifname}: {ipaddr}/{cidr}",
+            "on-click": "gnome-control-center wifi"
         },
         "pulseaudio": {
             "scroll-step": 1,
-            "format": "{icon} {volume}%",
-            "format-muted": "婢 {volume}%",
-            "format-bluetooth": "{icon} {volume}%",
-            "format-bluetooth-muted": "婢 {icon}",
+            "format": "{icon}",
+            "format-muted": "",
             "format-icons": {
                 "headphone": "",
-                "phone": "",
-                "portable": "",
-                "car": "",
-                "default": ["奄", "奔", "墳"]
+                "default": ["", ""]
             },
-            "on-click": "pavucontrol"
+            "tooltip-format": "Volume:  {volume}%\n{desc}",
+            "on-click": "gnome-control-center sound"
         },
         "idle_inhibitor": {
             "format": "{icon}",
diff --git a/config/linux/waybar/style.css b/config/linux/waybar/style.css
index ebcf4a6..e83e12b 100644
--- a/config/linux/waybar/style.css
+++ b/config/linux/waybar/style.css
@@ -1,7 +1,7 @@
 * {
     border-radius: 0;
     border: 0;
-    font-family: Noto Sans, JetBrainsMono Nerd Font;
+    font-family: "Noto Sans", "Font Awesome 5 Free";
     font-size: 11pt;
     text-shadow: none;
 }
@@ -10,6 +10,22 @@ window#waybar {
     background: #eff0f2;
     color: #4a4b4e;
     border-bottom: 1px solid #dee2e0;
+    border-left: 5px solid black;
+    border-right: 5px solid black;
+}
+
+.modules-left, .modules-center, .modules-right {
+    background: #eff0f2;
+    border-bottom: 1px solid #dee2e0;
+}
+
+.modules-left {
+    border-radius: 5px 0 0 0;
+    padding-left: 5px;
+}
+
+.modules-right {
+    border-radius: 0 5px 0 0;
 }
 
 tooltip {