2 files changed, 41 insertions, 48 deletions
diff --git a/sway-de/waybar/.config/waybar/config b/sway-de/waybar/.config/waybar/config
index 773cd58..f3dd9b1 100644
--- a/sway-de/waybar/.config/waybar/config
+++ b/sway-de/waybar/.config/waybar/config
@@ -5,84 +5,63 @@
         "position": "top",
         "height": 0,
         "modules-left": ["sway/workspaces", "sway/mode"],
-        "modules-center": [],
-        "modules-right": ["tray", "custom/reboot", "custom/backup", "network#wifi", "pulseaudio", "battery#bat0", "battery#bat1", "temperature", "idle_inhibitor", "clock#local"],
+        "modules-center": ["sway/window"],
+        "modules-right": ["tray", "custom/reboot", "custom/backup", "pulseaudio", "battery", "temperature", "idle_inhibitor", "clock"],
         "sway/workspaces": {
-            "format": "{icon}",
+            "format": "{name}<span font_scale='superscript' rise='6pt'> {index}</span>",
             "format-icons": {
                 "1": "",
                 "2": "",
                 "3": ""
             }
         },
+        "sway/window": {
+          "max-length": 100,
+          "rewrite": {
+            "(.*) — Mozilla Firefox": "$1"
+          },
+          "icon": true,
+          "icon-size": 20
+        },
         "tray": {
             "spacing": 20
         },
-        "clock#local": {
+        "clock": {
             "interval": 1,
             "format": "{:%a %d %b %I:%M %p}",
+            "format-alt": "{:%Y-%m-%d %H:%M:%S}",
             "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
             "today-format": "<b>{}</b>"
         },
         "temperature": {
             "critical-threshold": 80,
-            "format": "{temperatureC}°C {icon}",
-            "format-icons": ["", "", "", "", ""],
+            "format": "{icon}",
+            "format-alt": "{temperatureC}°C {icon}",
+            "format-icons": ["", "", ""],
             "tooltip-format": "Temperature:  {temperatureC}°C"
         },
-        "battery#bat0": {
-            "bat": "BAT0",
-            "adapter": "AC",
-            "interval": 60,
-            "states": {
-                "5": 100,
-                "4": 80,
-                "3": 60,
-                "2": 40,
-                "1": 20,
-                "0": 5
-            },
-            "format": "{capacity}% {icon}",
-            "format-charging": "{capacity}% \uf0e7",
-            "format-icons": ["", "", "", "", ""],
-            "tooltip-format": "Battery: {capacity}%\n{timeTo}"
-        },
-        "battery#bat1": {
-            "bat": "BAT1",
-            "adapter": "AC",
+        "battery": {
             "interval": 60,
             "states": {
-                "5": 100,
-                "4": 80,
-                "3": 60,
-                "2": 40,
-                "1": 20,
-                "0": 5
+              "warning": 30,
+              "critical": 15
             },
-            "format": "{capacity}% {icon}",
-            "format-charging": "{capacity}% \uf0e7",
+            "format": "{icon}",
+            "format-alt": "{capacity}% {icon}",
+            "format-charging": "\uf0e7",
             "format-icons": ["", "", "", "", ""],
             "tooltip-format": "Battery: {capacity}%\n{timeTo}"
         },
-        "network#wifi": {
-            "interface": "wlp*",
-            "format-ethernet": "",
-            "format-wifi": "{signalStrength}% ",
-            "format-linked": "",
-            "format-disconnected": "",
-            "tooltip-format": "Signal: {signalStrength}%\n{essid}\n{ifname}: {ipaddr}/{cidr}",
-            "on-click": "gnome-control-center wifi"
-        },
         "pulseaudio": {
-            "scroll-step": 1,
-            "format": "{volume}% {icon}",
-            "format-muted": "{volume}% ",
+            "scroll-step": 5,
+            "format": "{icon}",
+            "format-muted": "",
             "format-icons": {
                 "headphone": "",
                 "default": ["", ""]
             },
             "tooltip-format": "Volume:  {volume}%\n{desc}",
-            "on-click": "gnome-control-center sound"
+            "on-click": "pavucontrol-qt"
         },
         "idle_inhibitor": {
             "format": "{icon}",
diff --git a/sway-de/waybar/.config/waybar/style.css b/sway-de/waybar/.config/waybar/style.css
index 8540450..de3eb19 100644
--- a/sway-de/waybar/.config/waybar/style.css
+++ b/sway-de/waybar/.config/waybar/style.css
@@ -1,7 +1,7 @@
 * {
     border-radius: 0;
     border: 0;
-    font-family: "Noto Sans", "Font Awesome 6 Free";
+    font-family: "Noto Sans", "Font Awesome 6 Free Solid";
     font-size: 11pt;
     text-shadow: none;
 }
@@ -45,10 +45,12 @@ label, #tray {
 #workspaces label {
     padding: 0;
     font-weight: bold;
+    font-family: "Noto Sans", "Font Awesome 6 Free Regular";
 }
 
 #workspaces button {
     padding: 0 6px;
+    min-width: 30px;
 }
 
 #workspaces button:hover {
@@ -69,6 +71,18 @@ label, #tray {
   font-weight: 500;
 }
 
+#battery.warning:not(.charging) {
+    color: #714700;
+}
+
+#battery.critical:not(.charging) {
+    color: #a50000;
+}
+
+#temperature.critical {
+    color: #a50000;
+}
+
 #clock {
   font-weight: 500;
 }