modules/sway: don't hardcode battery number

1 files changed, 19 insertions, 12 deletions

diff --git a/modules/workstation/windowing/sway/status_command.in b/modules/workstation/windowing/sway/status_command.in
index 59537af22efa..b2cd2c792b28 100644
--- a/modules/workstation/windowing/sway/status_command.in
+++ b/modules/workstation/windowing/sway/status_command.in
@@ -2,26 +2,33 @@
 
 loopwhilex
 
+elglob bats /sys/class/power_supply/BAT*
+
 # We need to capture the whole status line, and then echo it all at
 # once, to work around https://github.com/swaywm/sway/issues/3857.
 backtick -i -n line {
   foreground {
-    backtick -i -n status { cat /sys/class/power_supply/BAT0/status }
-    importas -i -u status status
+    forx bat { $bats }
+    importas -i -u bat bat
 
-    ifelse { test $status = Charging }
-    { printf "↑" }
+    foreground {
+      backtick -i -n status { cat ${bat}/status }
+      importas -i -u status status
 
-    if { test $status = Discharging }
-    printf "↓"
-  }
+      ifelse { test $status = Charging }
+      { printf "↑" }
 
-  foreground {
-    redirfd -r 0 /sys/class/power_supply/BAT0/capacity
-    tr -d "\n"
-  }
+      if { test $status = Discharging }
+      printf "↓"
+    }
+
+    foreground {
+      redirfd -r 0 ${bat}/capacity
+      tr -d "\n"
+    }
 
-  foreground { printf "%%  " }
+    foreground { printf "%%  " }
+  }
 
   foreground { date "+%Y-%m-%d %H:%M:%S" }
 }