cleanup

home-manager/progs/eww/config/statusbar.yuck

@@ -39,18 +39,18 @@
 
 (defwidget window-title []
   (label
-  :text "${windowtitle == "" ? "" : "(${windowtitle})"}"))
+  :text {windowtitle == "" ? "" : "(${windowtitle})"}))
 
 (defwidget brightness-ctl []
   (box :visible brightnessctl-open
     (cmd-slider :symbol "󰃠" :value brightness
       :command `brightnessctl set {}%`
-      :max 101 :color "${
+      :max 101 :color {
       brightness >= 80 ? "green" :
       brightness >= 50 ? "yellow" :
       brightness >= 30 ? "peach" :
       brightness >= 10 ? "maroon" : "red"
-    }")))
+    })))
 
 
 (defpoll brightness :interval "1s" :run-while brightnessctl-open `brightnessctl -m | awk -F, '{print $4+0}'`)
@@ -105,7 +105,7 @@
   (box :space-evenly false
     :tooltip powerstats
     (label
-      :text "${EWW_BATTERY.BAT1.status == "Charging" ? "󰂄" :
+      :text {EWW_BATTERY.BAT1.status == "Charging" ? "󰂄" :
       EWW_BATTERY.BAT1.capacity >= 90 ? "󰁹" :
       EWW_BATTERY.BAT1.capacity >= 80 ? "󰂂" :
       EWW_BATTERY.BAT1.capacity >= 70 ? "󰂁" :
@@ -115,13 +115,13 @@
       EWW_BATTERY.BAT1.capacity >= 30 ? "󰁽" :
       EWW_BATTERY.BAT1.capacity >= 20 ? "󰁼" :
       EWW_BATTERY.BAT1.capacity >= 10 ? "󰁻" : "󰁺"
-      } "
-      :class "${
+      }
+      :class {
       EWW_BATTERY.BAT1.capacity >= 80 ? "green" :
       EWW_BATTERY.BAT1.capacity >= 50 ? "yellow" :
       EWW_BATTERY.BAT1.capacity >= 30 ? "peach" :
       EWW_BATTERY.BAT1.capacity >= 10 ? "maroon" : "red"
-    }")
+    })
     (label :text "${EWW_BATTERY.BAT1.capacity}%" :class "yellow")))
 
 
@@ -131,7 +131,7 @@
 (defwidget volume []
   (eventbox :tooltip volumesink
   :onclick `pwvucontrol &`
-  (label :text "${volumevalue.count}%" :class "${volumevalue.color}")))
+  (label :text "${volumevalue.count}%" :class {volumevalue.color})))
 
 
 (defpoll currentworkspace :interval "1s" `scripts/currentWorkspace.fish`)