lots of changes, mostly to align with the sway-config-fedora package

2 files changed, 42 insertions, 12 deletions

diff --git a/sway-de/waybar/.config/waybar/config b/sway-de/waybar/.config/waybar/config
index 00a08e4..773cd58 100644
--- a/sway-de/waybar/.config/waybar/config
+++ b/sway-de/waybar/.config/waybar/config
@@ -6,7 +6,7 @@
         "height": 0,
         "modules-left": ["sway/workspaces", "sway/mode"],
         "modules-center": [],
-        "modules-right": ["tray", "custom/reboot", "network#wifi", "pulseaudio", "battery#bat1", "temperature", "idle_inhibitor", "clock#local"],
+        "modules-right": ["tray", "custom/reboot", "custom/backup", "network#wifi", "pulseaudio", "battery#bat0", "battery#bat1", "temperature", "idle_inhibitor", "clock#local"],
         "sway/workspaces": {
             "format": "{icon}",
             "format-icons": {
@@ -15,6 +15,9 @@
                 "3": ""
             }
         },
+        "tray": {
+            "spacing": 20
+        },
         "clock#local": {
             "interval": 1,
             "format": "{:%a %d %b %I:%M %p}",
@@ -23,11 +26,11 @@
         },
         "temperature": {
             "critical-threshold": 80,
-            "format": "{icon}",
+            "format": "{temperatureC}°C {icon}",
             "format-icons": ["", "", "", "", ""],
             "tooltip-format": "Temperature:  {temperatureC}°C"
         },
-        "battery#bat1": {
+        "battery#bat0": {
             "bat": "BAT0",
             "adapter": "AC",
             "interval": 60,
@@ -39,15 +42,32 @@
                 "1": 20,
                 "0": 5
             },
-            "format": "{icon}",
-            "format-charging": "",
+            "format": "{capacity}% {icon}",
+            "format-charging": "{capacity}% \uf0e7",
+            "format-icons": ["", "", "", "", ""],
+            "tooltip-format": "Battery: {capacity}%\n{timeTo}"
+        },
+        "battery#bat1": {
+            "bat": "BAT1",
+            "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}"
         },
         "network#wifi": {
             "interface": "wlp*",
             "format-ethernet": "",
-            "format-wifi": "",
+            "format-wifi": "{signalStrength}% ",
             "format-linked": "",
             "format-disconnected": "",
             "tooltip-format": "Signal: {signalStrength}%\n{essid}\n{ifname}: {ipaddr}/{cidr}",
@@ -55,8 +75,8 @@
         },
         "pulseaudio": {
             "scroll-step": 1,
-            "format": "{icon}",
-            "format-muted": "",
+            "format": "{volume}% {icon}",
+            "format-muted": "{volume}% ",
             "format-icons": {
                 "headphone": "",
                 "default": ["", ""]
@@ -77,6 +97,12 @@
             "exec": "~/.local/bin/dnf-needs-restarting",
             "return-type": "json",
             "interval": 60
+        },
+        "custom/backup": {
+            "format": "{}",
+            "exec": "~/.local/bin/checkbackup",
+            "return-type": "json",
+            "interval": 60
         }
     }
 ]
diff --git a/sway-de/waybar/.config/waybar/style.css b/sway-de/waybar/.config/waybar/style.css
index 36a330d..8540450 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 5 Free";
+    font-family: "Noto Sans", "Font Awesome 6 Free";
     font-size: 11pt;
     text-shadow: none;
 }
@@ -37,7 +37,7 @@ tooltip label {
     color: #4a484d;
 }
 
-label {
+label, #tray {
     padding: 2px 10px;
     margin: 0;
 }
@@ -61,10 +61,14 @@ label {
     background: #efefef;
 }
 
-#custom-reboot, #network, #pulseaudio, #battery, #temperature, #idle_inhibitor {
+#custom-reboot, #custom-backup, #idle_inhibitor {
   min-width: 18px;
 }
 
+#network, #pulseaudio, #battery, #temperature {
+  font-weight: 500;
+}
+
 #clock {
   font-weight: 500;
 }
@@ -79,6 +83,6 @@ label {
     text-shadow: 1px 1px 0 #992030;
 }
 
-#custom-reboot {
+#custom-reboot, #custom-backup.script-error {
     color: #a50000;
 }