fixes

modules/home/wayland/apps/eww/bar/eww.yuck

@@ -48,7 +48,7 @@
 
 
 (defwindow bar
-    :monitor 1
+    :monitor 0
     :geometry (geometry
       :x "0%"
       :y "0%"

modules/home/wayland/apps/eww/bar/modules/clock.yuck

@@ -5,8 +5,8 @@
     (eventbox
       :onhover "${EWW_CMD} update date_rev=true"
       :onhoverlost "${EWW_CMD} update date_rev=false"
-      :onclick "(sleep 0.1 && ${EWW_CMD} open --toggle calendar)"
-      :onrightclick "(sleep 0.1 && ${EWW_CMD} open --toggle powermenu)"
+      :onclick "(sleep 0.1 && eww-open-on-current-screen calendar --toggle)"
+      :onrightclick "(sleep 0.1 && eww-open-on-current-screen powermenu --toggle)"
       (box
         :class "datetime"
         (overlay
@@ -39,4 +39,4 @@
 (defpoll hour	:interval "15s"	"date '+%H'")
 (defpoll minute	:interval "15s"	"date '+%M'")
 (defpoll day	:interval "15s"	"date '+%d'")
-(defpoll month	:interval "15s"	"date '+%m'")
+(defpoll month	:interval "15s"	"date '+%m'")

modules/home/wayland/apps/eww/bar/modules/sys.yuck

@@ -7,7 +7,7 @@
 (defwidget sys-mod []
   (module
     (eventbox
-      :onclick "(sleep 0.1 && ${EWW_CMD} open --toggle sys)"
+      :onclick "(sleep 0.1 && eww-open-on-current-screen sys --toggle)"
       (box
         :orientation "v"
           (circular-progress

modules/home/wayland/apps/eww/bar/windows/calendar.yuck

@@ -1,9 +1,9 @@
 (defwindow calendar
-  :monitor 1
+  :monitor 0
   :geometry (geometry
     :x "0%"
     :y "0%"
   	:anchor "bottom right"
     :width "0px"
     :height "0px")
-  (window (calendar)))
+  (window (calendar)))

modules/home/wayland/apps/eww/bar/windows/powermenu.yuck

@@ -34,7 +34,7 @@
 )
 
 (defwindow powermenu
-    :monitor 1
+    :monitor 0
     :stacking "overlay"
     :geometry (geometry 
                     :anchor "center"
@@ -42,4 +42,4 @@
                     :height "120%")
     :namespace "eww-blur"
     (powermenu)
-)
+)

modules/home/wayland/apps/eww/bar/windows/radio.yuck

@@ -2,7 +2,7 @@
 (defvar radio_rev false)
 
 (defwindow radio
-  :monitor 1
+  :monitor 0
   :geometry (geometry
     :x "0%"
     :y "0%"
@@ -100,7 +100,7 @@
     (box
       :orientation "v"
       (button
-        :onclick "(sleep 0.1 && ${EWW_CMD} open --toggle --no-daemonize radio)"
+        :onclick "(sleep 0.1 && eww-open-on-current-screen radio --toggle --no-daemonize)"
         (label 
           :show-truncated false
           :class "icon-text" 
@@ -108,4 +108,4 @@
       )
     )
   )
-)
+)

modules/home/wayland/apps/eww/bar/windows/sys.yuck

@@ -129,7 +129,7 @@
 )
 
 (defwindow sys
-  :monitor 1
+  :monitor 0
   :stacking "overlay"
   :geometry (geometry
     :x "0%"
@@ -137,4 +137,4 @@
   	:anchor "bottom right"
     :width "0px"
     :height "0px")
-  (window (sys-win)))
+  (window (sys-win)))