refactor of yuck files

.config/eww/eww.yuck

@@ -1,33 +1,38 @@
 (include "./widgets.yuck")
 
-(defwindow dp-2 :monitor "DP-2"
+(defwindow dp-2
-               :geometry (geometry :x 0
+  :monitor "DP-2"
-                                   :y 0
+  :geometry (geometry 
-                                   :width "100%"
+    :x 0
-                                   :height "20px"
+    :y 0
-                                   :anchor "top center")
+    :width "100%"
-               :stacking "bg"
+    :height "20px"
-               :exclusive true
+    :anchor "top center")
-            	 :focusable "ondemand"
+  :stacking "bg"
-               :namespace "dp-2"
+  :exclusive true
+  :focusable "ondemand"
+  :namespace "dp-2"
   (top)
 )
 
-(defwindow dp-1 :monitor "DP-1"
+(defwindow dp-1
-               :geometry (geometry :x 0
+  :monitor "DP-1"
-                                   :y 0
+  :geometry (geometry
-                                   :width "100%"
+    :x 0
-                                   :height "20px"
+    :y 0
-                                   :anchor "top center")
+    :width "100%"
-               :stacking "bg"
+    :height "20px"
-               :exclusive true
+    :anchor "top center")
-               :focusable "ondemand"
+  :stacking "bg"
-               :namespace "dp-1"
+  :exclusive true
+  :focusable "ondemand"
+  :namespace "dp-1"
   (top)
 )
 
 (defwidget top []
-  (centerbox :orientation "h"
+  (centerbox 
+    :orientation "h"
     (left)
     (center)
     (right)
@@ -35,30 +40,33 @@
 )
 
 (defwidget left []
-  (box :orientation 'h'
+  (box
-       :class 'left'
+    :orientation 'h'
-       :space-evenly true
+    :class 'left'
-       :spacing 5
+    :space-evenly true
-       :halign 'start'
+    :spacing 5
+    :halign 'start'
     (loremText :text "Workspaces")
   )
 )
 
 (defwidget center []
-  (box :orientation 'h'
+  (box
-       :class 'center'
+    :orientation 'h'
-       :space-evenly false
+    :class 'center'
-       :spacing 5
+    :space-evenly false
+    :spacing 5
     (media)
   )
 )
 
 (defwidget right []
-  (box :orientation 'h'
+  (box
-       :class 'right'
+    :orientation 'h'
-       :space-evenly false
+    :class 'right'
-       :spacing 5
+    :space-evenly false
-       :halign 'end'
+    :spacing 5
+    :halign 'end'
     (hyprsunset)
     (datetime)
     (stray)

.config/eww/widgets/datetime.yuck

@@ -1,7 +1,8 @@
 (defwidget datetime []
-  (box :class "datetime"
+  (box
-       :halign "center"
+    :class "datetime"
-       :valign "center"
+    :halign "center"
+    :valign "center"
     { time == ''
       ? ''
       : time
@@ -10,8 +11,9 @@
 )
 
 (defvar time-visible false)
-(defpoll time :interval "1s"
+(defpoll time
-              :initial "initial-value"  ; optional, defaults to poll at startup
+  :interval "1s"
-              :run-while time-visible   ; optional, defaults to 'true'
+  :initial "initial-value"  ; optional, defaults to poll at startup
+  :run-while time-visible   ; optional, defaults to 'true'
   `date +"%H:%M - %a, %d %b"`        ; https://www.man7.org/linux/man-pages/man1/date.1.html
 )

.config/eww/widgets/lorem-text.yuck

@@ -1,5 +1,6 @@
 (defwidget loremText [text]
-  (label :text text
+  (label
-         :class 'lorem-text'
+    :text text
+    :class 'lorem-text'
   )
 )

.config/eww/widgets/media.yuck

@@ -11,14 +11,15 @@
 (defvar ellipsisArtist 20) ; set length for ellipsis on artist
 (defvar ellipsisTitle 25) ; set length for ellipsis on title
 (defwidget media []
-  (box :class "media"
+  (box
-       :halign "center"
+    :class "media"
-       :valign "center"
+    :halign "center"
-       :class { playerctl == '' || objectlength(playerctl) == 0
+    :valign "center"
-          ? 'music--off'
+    :class { playerctl == '' || objectlength(playerctl) == 0
-          : matches(playerctl.player, playerRegex)
+      ? 'music--off'
-            ? 'music--' + playerctl.player
+      : matches(playerctl.player, playerRegex)
-            : 'music--on' }
+        ? 'music--' + playerctl.player
+        : 'music--on' }
     { playerctl == '' || objectlength(playerctl) == 0
       ? ''
       : matches(playerctl.player, playerRegex)
@@ -28,6 +29,7 @@
   )
 )
 
-(deflisten playerctl :initial ""
+(deflisten playerctl
+  :initial ""
   `playerctl --follow metadata --format '{"player": "{{ playerName }}", "trackid": "{{ mpris:trackid }}", "length": "{{ duration(mpris:length) }}", "artUrl": "{{ mrpis:artUrl }}", "album": "{{ album }}", "albumArtist": "{{ xesam:albumArtist }}", "artist": "{{ artist }}", "autoRating": "{{ xesam:autoRating }}", "discNumber": "{{ xesam:discNumber }}", "title": "{{ title }}", "trackNumber": "{{ xesam:trackNumber }}", "url": "{{ xesam:url }}", "position": "{{ position }}"}'`
 )