new eww

home/programs/eww/src/eww.yuck

@@ -1,50 +1,2 @@
-<<<<<<< HEAD
-(defwindow bar-primary
-  :monitor 0
-  :geometry (geometry :x "0px"
-    :y "0px"
-    :width "100%"
-    :height "25px"
-    :anchor "top center")
-  :stacking "fg"
-  :reserve (struts :distance 25px" :side "top")
-  :windowtype "dock"
-  :wm-ignore false
-(box
-    :orientation "horizontal"
-    :halign "right"
-  (eventbox :onclick "notify-send Left"
-      :onrightclick "notify-send Right"
-      "Click Me!")
-  (rightSideBar)))
-=======
-(defwidget workspaces-and-windows []
-  (let content (split " " (file "/tmp/xmonad-eww-log"))
-    (let ws-list (take 9 content)
-      (let win-list (drop 9 content)
-        (box :orientation "vertical" :class "bar"
->>>>>>> test
-
-          ;; Workspaces
-          (box :orientation "horizontal"
-            (for ws in ws-list
-              (let class (if (starts-with ws "[[")
-                "ws-current"
-                (if (starts-with ws "(")
-                    "ws-visible"
-                    "ws-hidden")))
-                (let name (string-trim ws "[]()")
-                  (button :onclick (format "wmctrl -s %s" name)
-                          :class class
-                          (label :text name))))))
-
-          ;; Open windows
-          (box :orientation "horizontal" :class "window-list"
-            (for win in win-list
-              (let class (if (starts-with win "*") "win-focused" "win")
-                (label :class class :text (string-trim win "*")))))
-        )
-      )
-    )
-  )
-)
+(include "./bar.yuck")
+(include "./powerpopup.yuck")