waybar

2 files changed, 16 insertions, 16 deletions

diff --git a/waybar/config b/waybar/config
index a1f633d..699e6d0 100644
--- a/waybar/config
+++ b/waybar/config
@@ -1,14 +1,12 @@
 // vi: ft=json
 {
-    // "layer": "top", // Waybar at top layer
     "position": "bottom", // Waybar position (top|bottom|left|right)
-    "height": 30, // Waybar height (to be removed for auto height)
-    // "width": 1280, // Waybar width
-    "spacing": 4, // Gaps between modules (4px)
-    // Choose the order of the modules
-    "modules-left": ["sway/workspaces", "sway/mode", "sway/scratchpad"],
-    "modules-center": ["sway/window"],
-    "modules-right": ["idle_inhibitor","custom/wifiice", "pulseaudio", "network", "cpu", "memory", "temperature", "backlight", "sway/language", "battery", "clock", "tray"],
+    "height": 30,
+    "spacing": 4,
+    "modules-left": ["sway/workspaces", "sway/mode", "sway/scratchpad", "sway/window"],
+    "modules-center": ["clock"],
+    "modules-right": ["idle_inhibitor","custom/wifiice", "pulseaudio", "network", "cpu", "memory", "temperature", "backlight", "sway/language", "battery", "tray"],
+
     "sway/workspaces": {
         "disable-scroll": true,
         "all-outputs": false,
@@ -118,19 +116,16 @@
         "format": "{time} {capacity}% {icon}",
         "format-charging": "{capacity}% ",
         "format-plugged": "{capacity}% ",
-        "format-alt": "{time} {icon}",
+        "format-alt": "{capacity}% {icon}",
         "format-icons": ["", "", "", "", ""]
     },
-    "battery#bat2": {
-        "bat": "BAT2"
-    },
     "network": {
         // "interface": "wlp2*", // (Optional) To force the use of this interface
         "format-wifi": "{essid} ({signalStrength}%) ",
         "format-ethernet": "{ipaddr}/{cidr} ",
         "tooltip-format": "{ifname} via {gwaddr} ",
         "format-linked": "{ifname} (No IP) ",
-        "format-disconnected": "Disconnected ⚠",
+        "format-disconnected": "⚠ ",
         "format-alt": "{ifname}: {ipaddr}/{cidr}"
     },
     "pulseaudio": {
diff --git a/waybar/style.css b/waybar/style.css
index ce58783..309df28 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -1,7 +1,8 @@
 * {
     /* `otf-font-awesome` is required to be installed for icons */
-    font-family: FontAwesome, Roboto, Helvetica, Arial, sans-serif;
-    font-size: 13px;
+    /* font-family: FontAwesome, Roboto, Helvetica, Arial, sans-serif; */
+    font-family: FontAwesome, Comic Shanns;
+    font-size: 14px;
 }
 
 window#waybar {
@@ -113,7 +114,7 @@ button:hover {
 }
 
 #clock {
-    background-color: #64727D;
+    background-color: rgba(0, 0, 0, 0.2);
 }
 
 #battery {
@@ -144,6 +145,10 @@ button:hover {
     animation-direction: alternate;
 }
 
+#battery.warning:not(.charging) {
+    background-color: #f0932b;
+}
+
 label:focus {
     background-color: #000000;
 }