feat: structure for eww dots

hypr-configs/hyprland/eww/colors.scss

@@ -1 +1 @@
-@import "./themes/everblush.scss";
+@import "./assets/themes/everblush.scss";

hypr-configs/hyprland/eww/dashboard/dashboard.scss

@@ -1,20 +0,0 @@
-
-.heading {
-    font-size: 25px;
-    color: $accent;
-    margin: 5px;
-}
-
-.dmpdcontrol {
-    margin: 10px;
-}
-
-.dmpdcontrol label {
-    font-size: 20px;
-    margin: 0px 8px;
-}
-
-.dicons label {
-    font-size: 25px;
-    margin-right: 6px;
-}

hypr-configs/hyprland/eww/eww.scss

@@ -1,11 +1,11 @@
 @import "./colors.scss";
-@import "./src/bar/styles.scss";
-// @import "./bottom_bar/bar.scss";
-@import "./control_panel/control_panel.scss";
-@import "./dashboard/dashboard.scss";
-@import "./dock/dock.scss";
-@import "./desktop/desktop.scss";
+@import "./src/sidebar/styles.scss";
+@import "./src/control-panel/styles.scss";
+@import "./src/dashboard/styles.scss";
+@import "./src/dock/styles.scss";
+@import "./src/desktop/styles.scss";
 @import "./notification/notification.scss";
+// @import "./src/bottom-bar/styles.scss";
 
 * {
   all: unset;
@@ -110,7 +110,7 @@ checkbutton:checked {
 }
 
 entry {
-  // image: url('./image/screenshot.png');
+  // image: url('./assets/image/screenshot.png');
   padding: 5px;
   margin: 5px;
   border-radius: 5px;

hypr-configs/hyprland/eww/eww.yuck

@@ -1,48 +1,5 @@
 (include "./src/utils/_revealer.yuck")
-(include "./src/_pollers.yuck")
-(include "./src/_variables.yuck")
-
-(deflisten workspacejson
-  :initial '[{"focused": true, "empty": false, "name": 1}, {"focused": false, "empty": true, "name": 2}, {"focused": false, "empty": true, "name": 3}, {"focused": false, "empty": true, "name": 4}, {"focused": false, "empty": true, "name": 5}]'
-"./scripts/workspace.py")
-
-;; used mainly in control panel and dashboard
-(defpoll hostname :initial "idk" :interval "24h" 'echo "$(whoami)"')
-(defpoll uptime :initial "idk" :interval "1m" "uptime -p")
-(defpoll weatherjson
-  :initial '{
-  "FeelsLikeC": "0",
-  "FeelsLikeF": "0",
-  "cloudcover": "0",
-  "humidity": "0",
-  "localObsDateTime": "2000-00-00 07:27 AM",
-  "observation_time": "07:27 AM",
-  "precipInches": "0.0",
-  "precipMM": "0.0",
-  "pressure": "0",
-  "pressureInches": "0",
-  "temp_C": "0",
-  "temp_F": "0",
-  "uvIndex": "0",
-  "visibility": "0",
-  "visibilityMiles": "0",
-  "weatherCode": "727",
-  "weatherDesc": [{"value": "Idk"}],
-  "weatherIconUrl": [{"value": ""}],
-  "winddir16Point": "",
-  "winddirDegree": "0",
-  "windspeedKmph": "0",
-  "windspeedMiles": "0",
-  "icon": "idk",
-  "hourly": []
-  }'
-  :interval "1h"
-  :run-while revealcontrolpanel
-"./scripts/weather.py")
-(defpoll datehour :initial "12" :interval "30m" "date +'%H'")
-(defpoll notesc :interval "2s" :run-while reveal4 "cat -s ~/Documents/fuck.txt")
-(defpoll quotejson :interval "1h" `./scripts/quote.py`)
-(deflisten timerdis `./scripts/timer.py subscribe`)
+(include "./src/_definitions.yuck")
 
 ;; dock
 (deflisten tasksjson :initial "[]" "./scripts/tasklist.py")
@@ -59,33 +16,9 @@
 (defvar borderpixel 2)
 (defvar caffeine false)
 
-; Notifications
-(deflisten  notifications :initial '{
-  "count": 0,
-  "dnd": false,
-  "notifications": [],
-  "popups": []
-  }'
-  "./scripts/notifCatch"
-)
-
 ;; cava pipe ("borrowed from tail-r")
 ;; (deflisten cavajson :initial "[]" "./scripts/cava_pipe.sh")
 
-;; playerctl
-(deflisten psong "playerctl metadata --format '{{ title }}' -F")
-(deflisten partist "playerctl metadata --format '{{ artist }}' -F")
-(deflisten pcover "./scripts/pollcover.sh")
-(deflisten pstatus "playerctl status -F")
-(deflisten ptime
-  :initial '{
-  "position": 0,
-  "duration": 0,
-  "readable": "0:00"
-  }'
-  "playerctl -F metadata -f '{ \"position\": {{position/1000000}}, \"duration\": {{mpris:length/1000000}}, \"readable\": \"{{duration(position)}}/{{duration(mpris:length)}}\" }'")
-;; (deflisten pside "playerctl -F metadata -f '{ \"volume\": {{volume*100}}, \"shuffle\": \"{{shuffle}}\", \"loop\": \"{{loop}}\" }'")
-
 ;; wallpaper thing
 (defvar wallpapers "[]")
 
@@ -94,11 +27,18 @@
 
 (defpoll theme :interval "24h" "./scripts/toggletheme")
 
-(include "./src/bar/main.yuck")
-;; (include "./bottom_bar/bar.yuck")
-(include "./control_panel/control_panel.yuck")
-(include "./dashboard/dashboard.yuck")
-(include "./dock/dock.yuck")
-(include "./desktop/desktop.yuck")
+;; (include "./src/bottom_bar/bar.yuck")
+(include "./src/sidebar/main.yuck")
+
+(include "./src/control-panel/main.yuck")
+(include "./src/control-panel/windowswitcher.yuck")
+
+(include "./src/wallpapers/main.yuck")
+
+(include "./src/dashboard/main.yuck")
+
+(include "./src/dock/main.yuck")
+
+(include "./src/desktop/main.yuck")
+
 (include "./notification/notification.yuck")
-(include "./wallpapers/wallpapers.yuck")

hypr-configs/hyprland/eww/notification/notification.yuck

@@ -1,11 +1,11 @@
 
 (defwindow notifypopup
   :geometry (geometry
-              :x 0
-              :y 0
-              :width 480
-              :height 0
-              :anchor "top right")
+    :x 0
+    :y 0
+    :width 480
+    :height 0
+  :anchor "top right")
   :stacking "overlay"
   :monitor 0
   (revealer
@@ -27,7 +27,7 @@
     (centerbox
       :orientation "h"
       :class "notifbar"
-      (image :halign "start" :image-width 30 :image-height 30 :path {noti.icon != "null" ? noti.icon : "./image/idk.svg"})
+      (image :halign "start" :image-width 30 :image-height 30 :path {noti.icon != "null" ? noti.icon : "./assets/image/idk.svg"})
       (scroll
         :halign "center"
         :valign "center"
@@ -37,13 +37,13 @@
         :width 200
         (label
           :class "notiflabel"
-          :text {noti.app}))
+        :text {noti.app}))
       (button
         :halign "end"
         :onclick "./scripts/notifManage --close ${noti.id}"
         (label
           :class "notifclose"
-          :text "")))
+        :text "")))
     
     (box
       :orientation "h"
@@ -51,7 +51,7 @@
       :height 80
       :space-evenly false
       :spacing 10
-      (image :image-width 80 :image-height 80 :visible {noti.image != "null"} :path {noti.image != "null" ? noti.image : "./image/idk.svg"})
+      (image :image-width 80 :image-height 80 :visible {noti.image != "null"} :path {noti.image != "null" ? noti.image : "./assets/image/idk.svg"})
       
       (button
         :onclick "./scripts/notifManage --dismiss ${noti.id}"
@@ -69,15 +69,15 @@
             :hexpand true
             (label
               :class "notiftitle"
-              :text {noti.summary}))
-            (scroll
-              :hscroll true 
-              :vscroll false
-              :hexpand true
-              (label 
-                :class "notifbody"
-                :visible {noti.body != "null"}
-                :text {noti.body})))))
+            :text {noti.summary}))
+          (scroll
+            :hscroll true
+            :vscroll false
+            :hexpand true
+            (label
+              :class "notifbody"
+              :visible {noti.body != "null"}
+            :text {noti.body})))))
     
     (box
       :orientation "h"
@@ -86,5 +86,5 @@
           :onclick "./scripts/notifManage --action ${noti.id} ${action[0]} && ./scripts/notifManage --close ${noti.id}"
           (label
             :class "notifactions"
-            :text {action[1]}))
-        ))))
+          :text {action[1]}))
+      ))))

hypr-configs/hyprland/eww/src/_definitions.yuck

@@ -0,0 +1,97 @@
+(defvar revealVolume false)
+(defvar revealMicrophone false)
+(defvar revealBrightness false)
+(defvar revealControlpanel false)
+(defvar reveal1 false)
+(defvar reveal2 false)
+(defvar reveal3 false)
+(defvar reveal4 false)
+(defvar reveal5 false)
+(defvar reveal6 false)
+(defvar revealweather false)
+(defvar revealsystray false)
+
+; Workspaces
+(defvar show_no_of_windows false)
+(deflisten workspacesjson :initial "[]" "./scripts/workspaces get-all-workspaces")
+(defpoll current_workspace :initial "0" :interval "50ms" "./scripts/workspaces get-active-workspace")
+
+; Notifications
+(deflisten  notifications :initial '{
+  "count": 0,
+  "dnd": false,
+  "notifications": [],
+  "popups": []
+  }'
+  "./scripts/notifCatch"
+)
+
+; Playerctl
+(deflisten psong "playerctl metadata --format '{{ title }}' -F")
+(deflisten partist "playerctl metadata --format '{{ artist }}' -F")
+(deflisten pcover "./scripts/pollcover.sh")
+(deflisten pstatus "playerctl status -F")
+(deflisten ptime
+  :initial '{
+  "position": 0,
+  "duration": 0,
+  "readable": "0:00"
+  }'
+  "playerctl -F metadata -f '{ \"position\": {{position/1000000}}, \"duration\": {{mpris:length/1000000}}, \"readable\": \"{{duration(position)}}/{{duration(mpris:length)}}\" }'")
+;; (deflisten pside "playerctl -F metadata -f '{ \"volume\": {{volume*100}}, \"shuffle\": \"{{shuffle}}\", \"loop\": \"{{loop}}\" }'")
+
+
+(defpoll thour :initial "0" :interval "60s" "date +'%I'")
+(defpoll tmin :initial "0" :interval "60s" "date +'%M'")
+(defpoll tpm :initial "0" :interval "60s" "date +'%p'")
+(defpoll volumemute :initial "false" :interval "1s" "pamixer --get-mute")
+(defpoll volume :initial "0" :interval "1s" "pactl get-sink-volume @DEFAULT_SINK@ | awk '{print $5}' | tr -d '%'")
+(defpoll mic_volume :initial "0" :interval "1s" "pactl get-source-volume @DEFAULT_SOURCE@ | awk '{print $5}' | tr -d '%'")
+(defpoll brightness :initial "0" :interval "2s" "brightnessctl -m | awk -F, '{print substr($4, 0, length($4)-1)}' | tr -d '%'")
+(defpoll wifi_icon :initial "" :interval "30s" "./scripts/wifi --ICON")
+(defpoll wifi_essid :initial "" :interval "30s" "./scripts/wifi --ESSID")
+(defpoll wifi_radio :initial "off" :interval "2s" "nmcli radio wifi")
+(defpoll calendar_day :initial "1" :interval "20h" "date '+%d'")
+(defpoll calendar_year :initial "2000" :interval "20h" "date '+%Y'")
+(defpoll bat0 :initial "0" :interval "30s" "bash ./scripts/sys_info --bat")
+(defpoll baticon :initial "" :interval "30s" "bash ./scripts/sys_info --baticon")
+(defpoll batstat :interval "30s" "cat /sys/class/power_supply/BAT0/status")
+(defpoll homedir :initial "" :interval "24h" "echo ~")
+
+; Controlpanel
+(defpoll hostname :initial "idk" :interval "24h" 'echo "$(whoami)"')
+(defpoll uptime :initial "idk" :interval "1m" "uptime -p")
+(deflisten timerdis "./scripts/timer.py subscribe")
+(defpoll weatherjson
+  :initial '{
+  "FeelsLikeC": "0",
+  "FeelsLikeF": "0",
+  "cloudcover": "0",
+  "humidity": "0",
+  "localObsDateTime": "2000-00-00 07:27 AM",
+  "observation_time": "07:27 AM",
+  "precipInches": "0.0",
+  "precipMM": "0.0",
+  "pressure": "0",
+  "pressureInches": "0",
+  "temp_C": "0",
+  "temp_F": "0",
+  "uvIndex": "0",
+  "visibility": "0",
+  "visibilityMiles": "0",
+  "weatherCode": "727",
+  "weatherDesc": [{"value": "Idk"}],
+  "weatherIconUrl": [{"value": ""}],
+  "winddir16Point": "",
+  "winddirDegree": "0",
+  "windspeedKmph": "0",
+  "windspeedMiles": "0",
+  "icon": "idk",
+  "hourly": []
+  }'
+  :interval "1h"
+  :run-while revealcontrolpanel
+"./scripts/weather.py")
+(defpoll datehour :initial "12" :interval "30m" "date +'%H'")
+(defpoll notesc :interval "2s" :run-while reveal4 "cat -s ~/Documents/fuck.txt")
+(defpoll quotejson :interval "1h" `./scripts/quote.py`)

hypr-configs/hyprland/eww/src/_pollers.yuck

@@ -1,16 +0,0 @@
-(defpoll thour :initial "0" :interval "60s" "date +'%I'")
-(defpoll tmin :initial "0" :interval "60s" "date +'%M'")
-(defpoll tpm :initial "0" :interval "60s" "date +'%p'")
-(defpoll volumemute :initial "false" :interval "1s" "pamixer --get-mute")
-(defpoll volume :initial "0" :interval "1s" "pactl get-sink-volume @DEFAULT_SINK@ | awk '{print $5}' | tr -d '%'")
-(defpoll mic_volume :initial "0" :interval "1s" "pactl get-source-volume @DEFAULT_SOURCE@ | awk '{print $5}' | tr -d '%'")
-(defpoll brightness :initial "0" :interval "2s" "brightnessctl -m | awk -F, '{print substr($4, 0, length($4)-1)}' | tr -d '%'")
-(defpoll wifi_icon :initial "" :interval "30s" "./scripts/wifi --ICON")
-(defpoll wifi_essid :initial "" :interval "30s" "./scripts/wifi --ESSID")
-(defpoll wifi_radio :initial "off" :interval "2s" "nmcli radio wifi")
-(defpoll calendar_day :initial "1" :interval "20h" "date '+%d'")
-(defpoll calendar_year :initial "2000" :interval "20h" "date '+%Y'")
-(defpoll bat0 :initial "0" :interval "30s" "bash ./scripts/sys_info --bat")
-;; (defpoll baticon :initial "" :interval "30s" "bash ./scripts/sys_info --baticon")
-;; (defpoll batstat :interval "30s" "cat /sys/class/power_supply/BAT0/status")
-(defpoll homedir :initial "" :interval "24h" "echo ~")

hypr-configs/hyprland/eww/src/_variables.yuck

@@ -1,13 +0,0 @@
-(defvar revealVolume false)
-(defvar revealMicrophone false)
-(defvar revealBrightness false)
-
-(defvar reveal1 false)
-(defvar reveal2 false)
-(defvar reveal3 false)
-(defvar reveal4 false)
-(defvar reveal5 false)
-(defvar reveal6 false)
-(defvar revealweather false)
-(defvar revealsystray false)
-(defvar revealcontrolpanel false)

hypr-configs/hyprland/eww/src/bottom-bar/main.yuck

@@ -1,10 +1,12 @@
+(include "./src/bottom-bar/sidectl.yuck")
+
 (defwindow bar
   :geometry (geometry
-              :x "0%"
-              :y "0%"
-              :width "100%"
-              :height 40
-              :anchor "bottom center")
+    :x "0%"
+    :y "0%"
+    :width "100%"
+    :height 40
+  :anchor "bottom center")
   :exclusive true
   :monitor 0
   :wm-ignore false
@@ -12,8 +14,8 @@
 
 (defwidget barstruct []
   ;; (box
-  ;;   :orientation "v"
-  ;;   :space-evenly false 
+    ;;   :orientation "v"
+    ;;   :space-evenly false
     (centerbox
       :class "barwidget"
       :orientation "h"
@@ -22,22 +24,22 @@
       (middle)
       (right))
     ;; (revealer
-    ;;   :transition "slideup"
-    ;;   :reveal revealcontrolpanel
-    ;;   (box 
-    ;;     :class "barwidget"
-    ;;     :orientation "h"
-    ;;     :space-evenly false
-    ;;     (box
-    ;;       :orientation "v"
-    ;;       :space-evenly false 
-    ;;       (user)
-    ;;       (chooser))
-    ;;     (overview)
-    ;;     (timer)
-    ;;     (touchpad)
-    ;;     )))
-    )
+      ;;   :transition "slideup"
+      ;;   :reveal revealcontrolpanel
+      ;;   (box
+        ;;     :class "barwidget"
+        ;;     :orientation "h"
+        ;;     :space-evenly false
+        ;;     (box
+          ;;       :orientation "v"
+          ;;       :space-evenly false
+          ;;       (user)
+          ;;       (chooser))
+        ;;     (overview)
+        ;;     (timer)
+        ;;     (touchpad)
+      ;;     )))
+)
 
 (defwidget left []
   (box
@@ -48,7 +50,7 @@
     (home)
     (workspaces)
     ;; (cavapipe)
-    ))
+  ))
 
 (defwidget middle []
   (box
@@ -57,7 +59,7 @@
     :halign "center"
     :valign "fill"
     (tasklist :iconsize 42)
-    ))
+  ))
 
 (defwidget right []
   (box
@@ -66,12 +68,12 @@
     :halign "end"
     :valign "fill"
     (button :class "widget" :onclick "./scripts/touchkey.sh && ${EWW_CMD} update revealcontrolpanel=false"
-        (label :class "icon" :style "padding-left: 3px;" :text "󰌌"))
+      (label :class "icon" :style "padding-left: 3px;" :text "󰌌"))
     (playerctl)
     (sysicons)
     ;; (battery)
     (clock)
-    ))
+  ))
 
 (defwidget workspaces []
   (eventbox
@@ -91,18 +93,18 @@
             :orientation "h"
             :space-evenly false
             (box
-              :width 50)
+            :width 50)
             (revealer
               :reveal { !workspacejson[i].empty || workspacejson[i].focused }
               :transition "slideright"
               (box
-                :width 30))
+              :width 30))
             (revealer
               :reveal { workspacejson[i].focused }
               :transition "slideright"
               (box
-                :width 20))
-            ))))))
+              :width 20))
+          ))))))
 
 (defwidget clock []
   (box
@@ -136,8 +138,8 @@
             :min 0
             :max 100
             :value bat0
-            :class "overbat ${EWW_BATTERY.BAT0.status == 'Charging' ? 'charging' : ''}"))
-        ))))
+          :class "overbat ${EWW_BATTERY.BAT0.status == 'Charging' ? 'charging' : ''}"))
+      ))))
 
 (defwidget battery []
   (box
@@ -152,11 +154,11 @@
         :max 100
         :min 0
         :flipped true
-        :active false)
+      :active false)
       (label
         :class "lightning"
         :visible {EWW_BATTERY.BAT0.status == "Charging"}
-        :text "󱐋"))
+      :text "󱐋"))
     (label :text "${bat0}%")))
 
 (defwidget playerctl []
@@ -175,41 +177,40 @@
       :valign "center"
       (eventbox
         :onclick "${EWW_CMD} update reveal1=false reveal2=false reveal3=${!reveal3}"
-        (image :path { pcover == "" ? "./image/emptympd.png" : pcover } :image-width 30 :image-height 30 :style "padding: 0px 5px;"))
+        (image :path { pcover == "" ? "./assets/image/emptympd.png" : pcover } :image-width 30 :image-height 30 :style "padding: 0px 5px;"))
       (button :onclick "playerctl previous"
         (label :class "icon" :text "󰒮"))
       (button :onclick "playerctl play-pause"
         (label :class "icon" :text  { pstatus == "Playing" ? "" : "" }))
       (button :onclick "playerctl next"
         (label :class "icon" :text "󰒭"))
-      )))
+    )))
 
 (defwidget home []
-    (box
-        :class "widget"
-        :hexpand false
-        :vexpand false
-        (eventbox
-            ;; :onclick "~/.config/eww/meowidgets/scripts/launch"
-            ;; :onclick "~/.config/eww/meowayland/scripts/launch"
-            ;; :onclick "./scripts/pop control"
-            :onclick "${EWW_CMD} update revealcontrolpanel=${ !revealcontrolpanel }"
-            :onrightclick "${EWW_CMD} open wallpaperselect --toggle"
-            :cursor "pointer"
-            (label :text "" :halign "center" :class "launchicon" :style "padding: 0px 4px;"))))
+  (box
+    :class "widget"
+    :hexpand false
+    :vexpand false
+    (eventbox
+      ;; :onclick "~/.config/eww/meowidgets/scripts/launch"
+      ;; :onclick "~/.config/eww/meowayland/scripts/launch"
+      ;; :onclick "./scripts/pop control"
+      :onclick "${EWW_CMD} update revealcontrolpanel=${ !revealcontrolpanel }"
+      :onrightclick "${EWW_CMD} open wallpaperselect --toggle"
+      :cursor "pointer"
+      (label :text "" :halign "center" :class "launchicon" :style "padding: 0px 4px;"))))
 
 ;; (defwidget cavapipe []
-;;   (box
-;;     :class "widget"
-;;     :orientation "h"
-;;     :space-evenly true 
-;;     (for bar in {cavajson}
-;;       (scale 
-;;         :class "cavascale"
-;;         :orientation "v"
-;;         :value bar
-;;         :min 0 
-;;         :max 100 
-;;         :flipped true))))
+  ;;   (box
+    ;;     :class "widget"
+    ;;     :orientation "h"
+    ;;     :space-evenly true
+    ;;     (for bar in {cavajson}
+      ;;       (scale
+        ;;         :class "cavascale"
+        ;;         :orientation "v"
+        ;;         :value bar
+        ;;         :min 0
+        ;;         :max 100
+      ;;         :flipped true))))
 
-(include "./bottom_bar/sidectl.yuck")

hypr-configs/hyprland/eww/src/bottom-bar/sidectl.yuck

@@ -1,11 +1,11 @@
 
 (defwindow sidectl1
   :geometry (geometry
-              :x "0%"
-              :y "0%"
-              :width 320
-              :height 0
-              :anchor "bottom right")
+    :x "0%"
+    :y "0%"
+    :width 320
+    :height 0
+  :anchor "bottom right")
   :monitor 0
   :stacking "overlay"
   (revealer
@@ -18,7 +18,7 @@
       (box
         :height 700
         :class "popup"
-          (notiweathertoggle))
+        (notiweathertoggle))
       
       (box
         :class "popup"
@@ -27,16 +27,16 @@
           (calendar
             :day calendar_day
             :year calendar_year
-            :class "")))
-      )))
+          :class "")))
+    )))
 
 (defwindow sidectl2
   :geometry (geometry
-              :x 50 
-              :y 0
-              :width 200
-              :height 0
-              :anchor "bottom right")
+    :x 50
+    :y 0
+    :width 200
+    :height 0
+  :anchor "bottom right")
   :monitor 0
   :stacking "overlay"
   (revealer
@@ -62,14 +62,14 @@
               :class {wifi_radio == "enabled" ? "icontitlesel" : "icontitle"}
               :text {wifi_radio == "enabled" ? wifi_essid == "" ? "Disconnected" : "Connected" : "Off"}
               :subtext { wifi_essid == "" ? "..." : wifi_essid}
-              :toggle {wifi_radio == "enabled" ? "nmcli radio wifi off" : "nmcli radio wifi on"})
+            :toggle {wifi_radio == "enabled" ? "nmcli radio wifi off" : "nmcli radio wifi on"})
             
             (togglebuttons
               :icon ""
               :class {caffeine ? "icontitlesel" : "icontitle"}
               :text "Caffeine"
               :subtext {caffeine ? "on" : "off"}
-              :toggle {caffeine ? "swaymsg [app_id='.*'] inhibit_idle none && ${EWW_CMD} update caffeine=false" : "swaymsg [app_id='.*'] inhibit_idle open && ${EWW_CMD} update caffeine=true"}))
+            :toggle {caffeine ? "swaymsg [app_id='.*'] inhibit_idle none && ${EWW_CMD} update caffeine=false" : "swaymsg [app_id='.*'] inhibit_idle open && ${EWW_CMD} update caffeine=true"}))
           
           (box
             :orientation "h"
@@ -78,15 +78,15 @@
               :class "icontitle"
               :text "Theme"
               :subtext theme
-              :toggle "${EWW_CMD} update reveal2=false && ~/.config/eww/themeswitch/scripts/pop")
+            :toggle "${EWW_CMD} update reveal2=false && ~/.config/eww/themeswitch/scripts/pop")
             
             (togglebuttons
               :icon ""
               :class {notifications.dnd ? "icontitlesel" : "icontitle"}
               :text "Do not disturb"
               :subtext {notifications.dnd ? "on" : "off"}
-              :toggle "./scripts/notifManage --toggle")
-            ))
+            :toggle "./scripts/notifManage --toggle")
+          ))
         
         (sliderctl :icon {volumemute == 'false' ? "󰕾" : "󰖁"} :value volume :onchange "pamixer --set-volume {}")
         (sliderctl :icon "󰃞" :value brightness :onchange "brightnessctl set {}%")
@@ -102,13 +102,13 @@
               :orientation "h"
               :max 100
               :min 0
-              :active false)
+            :active false)
             (label
               :class "lightning"
               :visible {EWW_BATTERY.BAT0.status == "Charging"}
-              :text "󱐋"))
+            :text "󱐋"))
           (label :text "${bat0}%"))
-))))
+      ))))
 
 (defwidget togglebuttons [icon class text ?subtext toggle]
   (button
@@ -120,16 +120,16 @@
       (label
         :class "icon"
         :halign "start"
-        :text icon)
+      :text icon)
       (box
         :orientation "v"
         :hexpand true
         :halign "center"
         (label
-          :text text)
+        :text text)
         (label
           :limit-width 17
-          :text subtext)))))
+        :text subtext)))))
 
 (defwidget sliderctl [icon value onchange]
   (box
@@ -141,7 +141,7 @@
     (label
       :class "icon"
       :text icon
-      :style "margin-left: 5px;")
+    :style "margin-left: 5px;")
     
     (scale
       :class "sliderctl"
@@ -150,15 +150,15 @@
       :tooltip "${value}%"
       :min 0
       :max 100
-      :onchange onchange)))
+    :onchange onchange)))
 
 (defwindow sidectl3
   :geometry (geometry
-              :x 150
-              :y 0
-              :width 440
-              :height 0
-              :anchor "bottom right")
+    :x 150
+    :y 0
+    :width 440
+    :height 0
+  :anchor "bottom right")
   :monitor 0
   :stacking "overlay"
   (revealer
@@ -171,7 +171,7 @@
         :class "unbarwidget"
         :space-evenly false
         :spacing 20
-        (image :style "margin: 5px;" :image-height 190 :image-width 190 :path { pcover == "" ? "./image/emptympd.png" : pcover })
+        (image :style "margin: 5px;" :image-height 190 :image-width 190 :path { pcover == "" ? "./assets/image/emptympd.png" : pcover })
         (box
           :orientation "v"
           :space-evenly false
@@ -201,41 +201,41 @@
             :onchange "playerctl position {}"
             :min 0
             :max { ptime.duration }
-            :tooltip { ptime.readable }))
+          :tooltip { ptime.readable }))
         ;; (box
-        ;;   :orientation "v"
-        ;;   :space-evenly false
-        ;;   :valign "center"
-        ;;   :halign "end"
-        ;;   :class "sidempdctl"
-        ;;   (scale 
-        ;;     :value { pside.volume } 
-        ;;     :orientation "v"
-        ;;     :class "mpdvolumeseek"
-        ;;     :onchange "playerctl volume {}"
-        ;;     :min 0 
-        ;;     :max 100
-        ;;     :flipped true
-        ;;     :tooltip "volume: ${pside.volume}")
-        ;;   (button 
-        ;;     :onclick "playerctl shuffle toggle"
-        ;;     (label 
-        ;;       :text {pside.shuffle == "true" ? "󰒝" : "󰒞"}))
-        ;;   (button 
-        ;;     :onclick "playerctl loop ${pside.loop == 'Track' ? 'Playlist' : 'Track'}"
-        ;;     (label 
-        ;;       :text {pside.loop == "Track" ? "󰑘" : "󰑖"}))
+          ;;   :orientation "v"
+          ;;   :space-evenly false
+          ;;   :valign "center"
+          ;;   :halign "end"
+          ;;   :class "sidempdctl"
+          ;;   (scale
+            ;;     :value { pside.volume }
+            ;;     :orientation "v"
+            ;;     :class "mpdvolumeseek"
+            ;;     :onchange "playerctl volume {}"
+            ;;     :min 0
+            ;;     :max 100
+            ;;     :flipped true
+          ;;     :tooltip "volume: ${pside.volume}")
+          ;;   (button
+            ;;     :onclick "playerctl shuffle toggle"
+            ;;     (label
+            ;;       :text {pside.shuffle == "true" ? "󰒝" : "󰒞"}))
+          ;;   (button
+            ;;     :onclick "playerctl loop ${pside.loop == 'Track' ? 'Playlist' : 'Track'}"
+            ;;     (label
+            ;;       :text {pside.loop == "Track" ? "󰑘" : "󰑖"}))
         ;;   )
-        ))))
+      ))))
 
 (defwindow sidectl4
   :geometry (geometry
-             :x 0
-             :y 0
-             :width 340
-             :height 0
-             :anchor "bottom left"
-             )
+    :x 0
+    :y 0
+    :width 340
+    :height 0
+    :anchor "bottom left"
+  )
   :stacking "overlay"
   :monitor 0
   (revealer
@@ -261,12 +261,12 @@
         (button :onclick "./scripts/pop scrop"
           (label :class "largetouchicon" :text "󰆞"))
       )
-    (box 
-      :orientation "v"
-      (button :onclick "swaymsg kill" 
-        (label :class "largetouchicon" :text "󰅙"))
-      (button :onclick "${EWW_CMD} update revealcontrolpanel=false && (cd && wofi --show=drun -i -I)"
-        (label :class "largetouchicon" :text "󰀻"))
-      (button :onclick "./scripts/touchkey.sh && ${EWW_CMD} update revealcontrolpanel=false" 
-        (label :class "largetouchicon" :text "󰌌"))
+      (box
+        :orientation "v"
+        (button :onclick "swaymsg kill"
+          (label :class "largetouchicon" :text "󰅙"))
+        (button :onclick "${EWW_CMD} update revealcontrolpanel=false && (cd && wofi --show=drun -i -I)"
+          (label :class "largetouchicon" :text "󰀻"))
+        (button :onclick "./scripts/touchkey.sh && ${EWW_CMD} update revealcontrolpanel=false"
+          (label :class "largetouchicon" :text "󰌌"))
       ))))

hypr-configs/hyprland/eww/src/control-panel/main.yuck

@@ -1,3 +1,5 @@
+(include "./src/control-panel/windowswitcher.yuck")
+
 (defwindow control_panel
   :geometry (geometry
     :x 10
@@ -217,7 +219,7 @@
       :valign "start"
       :halign "fill"
       :hexpand true
-      (image :style "margin: 10px;" :image-width 80 :image-height 80 :path "./image/fieshidle.gif")
+      (image :style "margin: 10px;" :image-width 80 :image-height 80 :path "./assets/image/fieshidle.gif")
       (scroll
         :hscroll true
         :vscroll false
@@ -304,7 +306,7 @@
     (image
       :image-width 50
       :image-height 50
-    :path "./image/weather/${hour.icon}.svg")
+    :path "./assets/image/weather/${hour.icon}.svg")
     (box
       :orientation "v"
       :space-evenly false
@@ -325,7 +327,7 @@
       :image-width 100
       :image-height 100
       :style "margin: 10px;"
-    :path "./image/weather/${weatherjson.icon}.svg")
+    :path "./assets/image/weather/${weatherjson.icon}.svg")
     (scroll
       :hscroll true
       :vscroll false
@@ -474,7 +476,7 @@
       :halign "center"
       :valign "center"
       :spacing 10
-      (image :image-width 100 :image-height 100 :path { pcover == "" ? "./image/emptympd.png" : pcover })
+      (image :image-width 100 :image-height 100 :path { pcover == "" ? "./assets/image/emptympd.png" : pcover })
       (box
         :orientation "v"
         :space-evenly false
@@ -499,5 +501,3 @@
             (label :text { pstatus == "Playing" ? "" : ""} ))
           (button :onclick "playerctl next"
             (label :text "󰒭")))))))
-
-(include "./control_panel/windowswitcher.yuck")

hypr-configs/hyprland/eww/src/control-panel/windowswitcher.yuck

@@ -1,7 +1,7 @@
 
 ;; Credits to T0kyob0y
 
-(defwidget overview[] 
+(defwidget overview []
   (box
     :space-evenly false
     :class "unbarwidget"
@@ -28,16 +28,16 @@
               :width {round(1920/5.8, 0)}
               (for j in {windows[i]}
                 (windowapp :w j)
-                ))
-                ))))))
+              ))
+          ))))))
 
 (defwidget windowapp [w]
   (box
     :style "
-      margin-left: ${round(((w.rect.x)/5.8), 0)}px;
-      margin-top: ${round(w.rect.y/5.8, 0)}px;
-      margin-right: -${round((w.rect.x + w.rect.width)/5.8, 0)}px;
-      margin-bottom: -${round(((w.rect.y + w.rect.height)/5.8), 0)}px;
+    margin-left: ${round(((w.rect.x)/5.8), 0)}px;
+    margin-top: ${round(w.rect.y/5.8, 0)}px;
+    margin-right: -${round((w.rect.x + w.rect.width)/5.8, 0)}px;
+    margin-bottom: -${round(((w.rect.y + w.rect.height)/5.8), 0)}px;
     "
     :hexpand false
     :vexpand false
@@ -55,4 +55,4 @@
         :image-height {round(w.rect.width/5.8 * 45/100, 0)}
         :image-width {round(w.rect.height/5.8 * 45/100, 0)}
         :path {w.path}
-        ))))
+      ))))

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

@@ -1,5 +1,4 @@
 
-;; Dashboard design is made by tsukki9696
 (defwindow dashboard
   :geometry (geometry
     :x 0
@@ -16,7 +15,7 @@
     :class "popup"
     :space-evenly false
     :orientation "v"
-    (duser :name "Failed" :tag "failed.sh" :pfp "./image/roundpfp.png")
+    (duser :name "Failed" :tag "failed.sh" :pfp "./assets/image/roundpfp.png")
     (box
       :space-evenly true
       :orientation "h"

hypr-configs/hyprland/eww/src/dashboard/styles.scss

@@ -0,0 +1,19 @@
+.heading {
+  font-size: 25px;
+  color: $accent;
+  margin: 5px;
+}
+
+.dmpdcontrol {
+  margin: 10px;
+}
+
+.dmpdcontrol label {
+  font-size: 20px;
+  margin: 0px 8px;
+}
+
+.dicons label {
+  font-size: 25px;
+  margin-right: 6px;
+}

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

@@ -30,12 +30,12 @@
 
 (defwidget imagesicon [name]
   (eventbox
-    :onclick "feh ./image/desktop/${name}.png"
+    :onclick "feh ./assets/image/desktop/${name}.png"
     :class "desktopbox"
     (box
       :orientation "v"
       :space-evenly false
       :height 100
       :valign "end"
-      (image :width 100 :height 100 :image-width 80 :image-height 80 :path "./image/desktop/${name}.png")
+      (image :width 100 :height 100 :image-width 80 :image-height 80 :path "./assets/image/desktop/${name}.png")
       (label :class "desktoptext" :text "${name}.png"))))

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

@@ -19,7 +19,7 @@
     :space-evenly false 
     (revealer 
       :transition "slideright"
-      :reveal revealcontrolpanel
+      :reveal revealControlpanel
       (control_widget))
       (centerbox 
         :class "barwidget"
@@ -69,23 +69,17 @@
     ; (battery)
   ))
 
-(defvar show_no_of_windows false)
-
-(deflisten workspacesdata :initial "[]" "./scripts/workspaces get-all-workspaces")
-
-(defpoll current_workspace :initial "0" :interval "50ms" "./scripts/workspaces get-active-workspace")
-
 (defwidget workspaces []
    (eventbox
     :cursor "pointer"
     :onscroll "./scripts/workspaces change {} ${current_workspace}"
-    :onhover "eww update show_no_of_windows=true"
-    :onhoverlost "eww update show_no_of_windows=false"
+    :onhover "${EWW_CMD} update show_no_of_windows=true"
+    :onhoverlost "${EWW_CMD} update show_no_of_windows=false"
     (box
         :class "workspaces"
         :space-evenly false
         :orientation "v"
-        (for workspace in {workspacesdata}
+        (for workspace in {workspacesjson}
           (button
             :onclick "hyprctl dispatch workspace ${workspace.id}"
             (box
@@ -109,7 +103,7 @@
             ;; :onclick "~/.config/eww/meowidgets/scripts/launch"
             ;; :onclick "~/.config/eww/meowayland/scripts/launch"
             ;; :onclick "./scripts/pop control"
-            :onclick "${EWW_CMD} update revealcontrolpanel=${ !revealcontrolpanel }"
+            :onclick "${EWW_CMD} update revealControlpanel=${ !revealControlpanel }"
             :onrightclick "${EWW_CMD} open wallpaperselect --toggle"
             :cursor "pointer"
             (label :text "" :halign "center" :class "launchicon" :style "padding: 2px 0px;"))))
@@ -205,7 +199,7 @@
       :spacing 5
       (eventbox 
         :onclick "${EWW_CMD} open music --toggle"
-        (image :path { pcover == "" ? "./image/emptympd.png" : pcover } :image-width 20 :image-height 20))
+        (image :path { pcover == "" ? "./assets/image/emptympd.png" : pcover } :image-width 20 :image-height 20))
       (button :onclick "playerctl previous"
         (label :class "picon" :text "󰒮"))
       (button :onclick "playerctl play-pause" 
@@ -313,7 +307,7 @@
       :class "unbarwidget"
       :space-evenly false 
       :spacing 20
-      (image :style "margin: 5px;" :image-height 190 :image-width 190 :path { pcover == "" ? "./image/emptympd.png" : pcover })
+      (image :style "margin: 5px;" :image-height 190 :image-width 190 :path { pcover == "" ? "./assets/image/emptympd.png" : pcover })
       (box
         :orientation "v"
         :space-evenly false 

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

@@ -8,7 +8,6 @@
   :anchor "center")
   :stacking "overlay"
   :monitor 0
-  :focusable true
   (box
     :class "popup"
     (wallpaperselectwidget)))
@@ -46,7 +45,7 @@
             :style "margin: 50px 0px 5px 0px;"
             :hexpand false
             :vexpand false
-            :path "./image/fieshidle.gif"
+            :path "./assets/image/fieshidle.gif"
             :visible {arraylength(wallpapers) == 0})
           
           (label