feat: eww bar workspaces new style

.vscode/settings.json

@@ -1,5 +1,5 @@
 {
     "files.associations": {
-        "*.yuck": "commonlisp"
+        "*.yuck": "clojure"
     },
 }

hypr-configs/hyprland/eww/assets/scss/windows/vbar.scss

@@ -1,17 +1,18 @@
 .vbar {
-  min-width: 2.4em;
+  min-width: 2.6em;
-  padding: 0.5em;
+  padding: 0.4em;
   background-color: $base;
 
   .workspaces {
     @include widget;
+    padding: 4px;
 
     * {
       transition: all cubic-bezier(0.165, 0.84, 0.44, 1) 500ms;
     }
 
     .workspace {
-      margin: 6px;
+      margin: 8px;
       border-radius: 4px;
     }
 

hypr-configs/hyprland/eww/format.sh

@@ -15,13 +15,7 @@ fi
 format_file() {
     local file="$1"
     echo "Formatting $file"
-    vim -E -s "$file" <<EOF
+    vim -c "execute 'normal! =G' | :wq!" "$file"
-:source /path/to/your/yuck.vim
-:filetype plugin indent on
-:set filetype=yuck
-:normal gg=G
-:wq
-EOF
 }
 
 last_run=0
@@ -30,7 +24,7 @@ inotifywait -m -r -e modify,create,delete,move --format '%w%f' "$WATCH_DIR" | wh
     if [[ "$file" == *.yuck ]]; then
         current_time=$(date +%s%N | cut -b1-13)
 
-        if ((current_time - last_run > 500)); then
+        if ((current_time - last_run > 2500)); then
             sleep 0.1
             if [ -e "$file" ]; then
                 format_file $file

hypr-configs/hyprland/eww/src/wallpapers/main.yuck

@@ -14,11 +14,12 @@
 
 (defwidget wallpaperselectwidget []
   (eventbox
-  ;; :onhoverlost "${EWW_CMD} close wallpaperselect"
+
     (box
       :orientation "v"
       :class "unbarwidget"
       :space-evenly false
+
       (box
         :orientation "h"
         :space-evenly false
@@ -65,6 +66,4 @@
                 :orientation "h"
                 :space-evenly true
                 (label :text "${wall.views} 󰈈")
-	(label :text "${wall.fav} 󰣐")
+                (label :text "${wall.fav} 󰣐")))))))))
-       ))))
-       ))))

hypr-configs/hyprland/eww/src/windows/vbar/main.yuck

@@ -12,8 +12,6 @@
     (centerbox
       :class "vbar"
       :orientation "v"
-
-   ;; :space-evenly true
       (top)
       (middle)
       (bottom)
@@ -38,10 +36,11 @@
     :vexpand false
     :class "center_modules"
     :height "180"
+
     (playerctl)
     ))
 
-	(defwidget bottom [] 
+(defwidget bottom []
   (box
     :orientation "v"
     :space-evenly false
@@ -55,7 +54,7 @@
     ; (battery)
     ))
 
-	(defwidget workspaces []
+(defwidget workspaces []
   (eventbox
     :cursor "pointer"
     :onscroll "./scripts/workspace/set-active {} ${current_workspace}"
@@ -79,18 +78,14 @@
               :duration 500
 
               (box
-		:height 45
+                :height 45)))
-	       )
-	      )
-	     )
-
           )
         )
       )
     )
   )
 
-	   (defwidget home []
+(defwidget home []
   (box
     :class "widget"
     :hexpand false
@@ -102,9 +97,10 @@
       :onclick "${EWW_CMD} update revealControlpanel=${ !revealControlpanel }"
       :onrightclick "${EWW_CMD} open wallpaperselect --toggle"
       :cursor "pointer"
+
       (label :text "" :halign "center" :class "launchicon" :style "padding: 2px 0px;"))))
 
-								     (defwidget systemtray []
+(defwidget systemtray []
   (box 
     :class "widget"
     :space-evenly false
@@ -113,7 +109,6 @@
     (eventbox
       :onclick "${EWW_CMD} update revealSystray=${!revealSystray}"
       (label :angle {!revealSystray ? 90 : 270} :class "revealtouch" :tooltip "reveal systray" :text ""))
-
     (revealer
       :reveal revealSystray
       :transition "slideup"
@@ -123,7 +118,7 @@
         ))
     ))
 
-								     (defwidget clock [] 
+(defwidget clock [] 
   (eventbox
     :cursor "pointer"
     :onclick "${EWW_CMD} open calendar --toggle"
@@ -131,12 +126,11 @@
       :orientation "v"
       :space-evenly false
       :class "widget clock"
-
       (label :text thour)
       (label :text tmin)
       (label :text tpm))))
 
-								     (defwidget battery [] 
+(defwidget battery [] 
   (box
     :orientation "v"
     :space-evenly false 
@@ -156,7 +150,7 @@
         :text "󱐋"))
     (label :text "${EWW_BATTERY.BAT0.capacity}%" :limit-width 3 :show-truncated false)))
 
-								     (defwidget hiddenctl []
+(defwidget hiddenctl []
   (eventbox 
     :cursor "pointer"
     :onclick {reveal3 ? "${EWW_CMD} update reveal3=false" : "${EWW_CMD} update reveal3=true"}
@@ -182,10 +176,9 @@
       (revealer
         :reveal {!reveal3}
         :transition "slidedown"
-									 ;; (tasklist)))))
         ))))
 
-									 (defwidget playerctl [] 
+(defwidget playerctl [] 
   (eventbox
     :cursor "pointer"
     (box
@@ -193,7 +186,6 @@
       :orientation "v"
       :space-evenly true
       :spacing 6
-
       (eventbox
         :onclick "${EWW_CMD} open music --toggle"
         (image :path { pcover == "" ? "./assets/image/emptympd.png" : pcover } :image-width 20 :image-height 20))
@@ -204,8 +196,7 @@
       (button :onclick "playerctl next"
         (label :class "picon" :text "󰒭"))
       )))
-
+(defwidget sliders []
-									      (defwidget sliders []
   (box
     :class "widget"
     :orientation "v"
@@ -214,7 +205,6 @@
     :valign "end"
     (button :onclick "alacritty -e nmtui" :tooltip wifi_essid 
       (label :class "icon" :style "font-size: 18px;" :text wifi_icon))
-
     (reveal_on_hover
       :var revealVolume
       :varname "revealVolume"
@@ -234,7 +224,6 @@
         :max 101
         :min 0
         :flipped true))
-
     (reveal_on_hover
       :var revealMicrophone
       :varname "revealMicrophone"
@@ -252,7 +241,6 @@
         :max 101
         :min 0
         :flipped true))
-
     (reveal_on_hover
       :var revealBrightness
       :varname "revealBrightness"
@@ -271,9 +259,8 @@
         :min 0
         :flipped true))
     ))
-
+;; other windows
-										 ;; other windows
+(defwindow calendar
-										 (defwindow calendar
   :geometry (geometry :x "0"
               :y "0"
               :width "100"
@@ -286,8 +273,7 @@
     (box
       :class "unbarwidget"
       (calendar :day calendar_day :year calendar_year :class "cal"))))
-
+(defwindow music 
-										 (defwindow music 
   :geometry (geometry :x "0"
               :y "0"
               :width "440"

linux-configs

@@ -1 +1 @@
-Subproject commit f39d12118656eb34ff64e857bde04250609d78b5
+Subproject commit 70cd2cc2b6f50df0af9b117ceb214a543471a603