updated eww files and bash scripts

eww/eww.yuck

@@ -22,6 +22,8 @@
     (box
         :space-evenly false
         :spacing 3
+        :valign "center"
+        :height 20
         (for workspace in workspaces
             (workspace
                 :activeOn {workspace.normal.activeOn}
@@ -96,24 +98,34 @@
 
 ;; Widget blocks
 
-;;(defwidget media []
-;;    (box
-;;        :class "smallBox"
-;;        :height 20
-;;        :valign "center"
-;;        :space-evenly false
-;;        :visible {media.status == "Playing" ? true : false}
-;;        (smallSpacer)
-;;        (label
-;;            :text {media.name}
-;;            :tooltip {media.name}
-;;            :limit-width 40)
-;;        (smallSpacer)))
+(defwidget media []
+    (box
+        :visible {media.status == "Playing" ? true : false}
+        :spacing 3
+        :space-evenly false
+        :halign "end"
+        :valign "center"
+        :height 20
+        (seperator)
+        (box
+            :class "smallBox"
+            :height 20
+            :valign "center"
+            :space-evenly false
+            (space)
+            (label
+                :text {media.name}
+                :tooltip {media.name}
+                :limit-width 40)
+            (space))))
 
 (defwidget processing []
     (eventbox
         :onclick 'hyprctl dispatch exec "[float; pin; size 40% 40%; move 100%-41% 40] kitty bpytop -b proc"'
         :class "smallBox"
+        :halign "end"
+        :valign "center"
+        :height 20
         (box
             :space-evenly false
             :halign "end"
@@ -129,6 +141,9 @@
     (eventbox
         :onclick 'hyprctl dispatch exec "[float; pin; size 40% 40%; move 100%-41% 40] kitty pulsemixer"'
         :class "smallBox"
+        :halign "end"
+        :valign "center"
+        :height 20
         (box
             :space-evenly false
             :halign "end"
@@ -144,11 +159,14 @@
     (eventbox
         :onclick "`networkmanager_dmenu`"
         :class "smallBox"
+        :halign "end"
+        :valign "center"
+        :height 20
         (box
             :space-evenly false
             :halign "end"
             :valign "center"
-            :height 20
+            :height 24
             (smallSpacer)
             (network)
             (space)
@@ -157,8 +175,10 @@
 
 (defwidget energy []
     (eventbox
-        :onclick `sleep 1 && systemctl hibernate`
+        :onclick `wlogout -r 25 -c 25 -m 300 &`
         :class "smallBox"
+        :valign "center"
+        :height 20
         (box
             :space-evenly false
             :halign "end"
@@ -173,17 +193,28 @@
 
 (defwidget start []
     (box
+	:class "barbox"
         :orientation "h"
         :space-evenly false
+        :height  30
         :halign "start"
+        :valign "center"
+        :spacing 3
         (space)
-        (time)))
+        (time)
+        (media)
+        (space)))
 
 (defwidget center [monitor]
     (box
+	:class "barbox"
         :orientation "h"
         :space-evenly false
+        :spacing 3
+        :height  30
         :halign "center"
+        :valign "center"
+        (space)
         (workspace
             :activeOn {workspaces[0].special.activeOn}
             :occupied {workspaces[0].special.occupied}
@@ -211,15 +242,26 @@
             :occupied {workspaces[3].special.occupied}
             :id {workspaces[3].special.id}
             :icon {workspaces[3].special.icon}
-            :monitor {monitor})))
+            :monitor {monitor})
+        (space)))
 
 (defwidget end []
     (box
+	:class "barbox"
         :spacing 2
         :orientation "h"
         :space-evenly false
+        :height  30
         :valign "center"
         :halign "end"
+        (space)
+;;        (systray
+;;            :spacing 2
+;;            :orientation "h"
+;;            :space-evenly true
+;;            :icon-size 16)
+;;
+;;        (seperator)
 
         (processing)
 
@@ -238,7 +280,8 @@
         (space)))
 
 (defwidget bar [monitor]
-    (centerbox    :orientation "h"
+    (centerbox
+        :orientation "h"
         (start)
         (center
             :monitor {monitor})
@@ -247,7 +290,6 @@
 
 (defwindow bar [monitor width height]
     :monitor {monitor}
-    :class "bar"
     :geometry (geometry
         :x "0%"
         :y "5px"
@@ -257,4 +299,4 @@
     :stacking "fg"
     :exclusive true
     (bar
-        :monitor {monitor}))
+        :monitor {monitor}))