From 18cae15ec49bfa8d2e5f99bd554584c2a741b3a6 Mon Sep 17 00:00:00 2001
From: Johannes Loher <johannes.loher@fg4f.de>
Date: Tue, 15 Sep 2020 05:51:19 +0200
Subject: [PATCH] cleanup waybar

---
 .config/waybar/config    | 30 ++++++++++-----------------
 .config/waybar/style.css | 45 ++++++++++++++++++++++++++--------------
 2 files changed, 40 insertions(+), 35 deletions(-)

diff --git a/.config/waybar/config b/.config/waybar/config
index 9db7d25..a9be677 100644
--- a/.config/waybar/config
+++ b/.config/waybar/config
@@ -1,7 +1,6 @@
 {
     "layer": "top",
     "position": "top",
-    // "height": 30,
     "modules-left": ["sway/workspaces", "custom/right-arrow-dark"],
     "modules-center": [
         "custom/left-arrow-dark",
@@ -25,13 +24,9 @@
         "battery",
         "custom/left-arrow-light",
         "custom/left-arrow-dark",
-        "tray"],
-    // Modules configuration
-    "sway/workspaces": {
-        "disable-scroll": true,
-        "all-outputs": false,
-        "format": "{name}"
-    },
+        "tray"
+    ],
+
     "custom/left-arrow-dark": {
         "format": "",
         "tooltip": false
@@ -48,6 +43,13 @@
         "format": "",
         "tooltip": false
     },
+
+    "sway/workspaces": {
+        "disable-scroll": true,
+        "all-outputs": false,
+        "format": "{name}"
+    },
+
     "disk": {
         "interval": 30,
         "format": "{free} ",
@@ -56,7 +58,7 @@
         "path": "/home"
     },
     "tray": {
-        // "icon-size": 21,
+        "icon-size": 22,
         "spacing": 10
     },
     "clock#1": {
@@ -73,7 +75,6 @@
     },
     "battery": {
         "states": {
-            // "good": 95,
             "warning": 30,
             "critical": 15
         },
@@ -84,16 +85,7 @@
         "format-icons": ["", "", "", "", ""],
         "tooltip": false
     },
-    "network": {
-        // "interface": "wlp2*", // (Optional) To force the use of this interface
-        "format-wifi": "{essid} ({signalStrength}%) ",
-        "format-ethernet": "{ifname}: {ipaddr}/{cidr} ",
-        "format-linked": "{ifname} (No IP) ",
-        "format-disconnected": "Disconnected ⚠",
-        "format-alt": "{ifname}: {ipaddr}/{cidr}"
-    },
     "pulseaudio": {
-        // "scroll-step": 1, // %, can be a float
         "format": "{volume}% {icon} {format_source}",
         "format-bluetooth": "{volume}% {icon} {format_source}",
         "format-bluetooth-muted": " {icon} {format_source}",
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index a2ebdd4..72baa58 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -11,34 +11,47 @@ window#waybar {
     color: #7780a1;
 }
 
-#workspaces button {
-    padding: 0 5px;
+#clock,
+#disk,
+#pulseaudio,
+#battery,
+#tray,
+#workspaces {
+    padding: 0 10px;
     background: #1f222d;
-    color: #7780a1;
 }
 
-#workspaces button.focused {
-    color: #ffffff;
-}
-
-
 #custom-right-arrow-dark,
 #custom-left-arrow-dark {
     color: #1f222d;
 }
+
 #custom-right-arrow-light,
 #custom-left-arrow-light {
     color: #252936;
     background: #1f222d;
 }
 
-
-#clock,
-#disk,
-#pulseaudio,
-#battery,
-#tray {
-    padding-left: 10px;
-    padding-right: 10px;
+#workspaces button {
+    padding: 0 5px;
     background: #1f222d;
+    color: #7780a1;
+    border: none;
+}
+
+#workspaces button.focused {
+    color: #ffffff;
+}
+
+#workspaces button:hover {
+    box-shadow: none;
+    text-shadow: none;
+}
+
+#battery.warning {
+    color: #ffd400;
+}
+
+#battery.critical {
+    color: #ff5400;
 }