From 8c9d0a03dba2af4c0520c91bdefaf7cd0a059484 Mon Sep 17 00:00:00 2001
From: Chris Cochrun <chris@cochrun.xyz>
Date: Wed, 30 Aug 2023 10:26:25 -0500
Subject: [PATCH] tweaks to simplify eww

---
 .config/eww/eww.scss             | 190 ++++++-----
 .config/eww/eww.yuck             | 561 ++++++++++++++++---------------
 .config/eww/scripts/nextcloud.sh |   1 +
 .config/eww/scripts/wks          |  18 +
 .config/eww/scripts/workspace    |  10 +-
 5 files changed, 429 insertions(+), 351 deletions(-)
 create mode 100644 .config/eww/scripts/nextcloud.sh
 create mode 100755 .config/eww/scripts/wks

diff --git a/.config/eww/eww.scss b/.config/eww/eww.scss
index 0ddb5f4..aa5884b 100644
--- a/.config/eww/eww.scss
+++ b/.config/eww/eww.scss
@@ -102,8 +102,8 @@ tooltip label {
 }
 
 .right_modules {
-    padding-bottom: 2px;
-    padding-right: 5px;
+    // padding-bottom: 2px;
+    // padding-right: 5px;
 }
 
 .separ {
@@ -153,22 +153,12 @@ tooltip label {
     border-radius: 10px;
 }
 
-.vol_module, .bright_module {
-    background-color: rgba(00, 00, 00, 0.0);
-    margin: 0px 3px 0px 5px;
-}
-
 .volbar {
     color: $base08;
     background-color: $widget-background;
     border-radius: 5px;
 }
 
-.vol_label {
-    color: $base08;
-    padding-top: 3px;
-}
-
 .volume_icon {
     font-size: 14;
     color: $base08;
@@ -186,51 +176,87 @@ tooltip label {
     margin: 0px 25px 0px 0px;
 }
 
-.iconlauncher {
-    color: $white;
-    font-size: 10px;
-    margin: 0px 10px 0px 10px;
+// ALL RIGHT MODULES
+
+.vol_module, .bright_module {
+    // background-color: rgba(00, 00, 00, 0.0);
+    // margin: 0px 3px 0px 5px;
 }
 
-.iconsearch {
-    color: $white;
-    font-size: 18px;
-}
-.iconmem {
-    color: $base0A;
-    padding: 2px 10px 0px 8px;
-}
-.iconbat {
-    color: $base0E;
-    margin: 2px 10px 0px 8px;
-}
-.iconcpu {
-    color: $base0D;
-    margin: 2px 10px 0px 8px;
-}
-.iconvol {
-    color: $base08;
-    margin: 2px 10px 0px 8px;
-}
-.iconbright {
-    color: $base09;
-    margin: 3px 13px 0px 8px;
-}
+// Icon Size
 .iconbat, .iconmem, .iconcpu .iconvol .iconbright {
     font-size: 12;
 }
+
+// Memory
+
+.mem_module {
+    // background-color: rgba(00, 00, 00, 0.0);
+    // border-radius: 16px;
+    // margin: 0px 5px 0px 0px;
+}
+
+.iconmem {
+    color: $base0A;
+    padding-top: 2px;
+}
 .mem_label {
     color: $base0A;
     padding-top: 3px;
 }
+
+// Battery
+
+.bat_module {
+    background-color: rgba(00, 00, 00, 0.0);
+    border-radius: 16px;
+    // margin: 0px 0px 0px 5px;
+}
+
+.iconbat {
+    color: $base0E;
+    // margin: 2px 10px 0px 8px;
+    padding-top: 3px;
+}
+
+.bat_label {
+    color: $base0E;
+    padding-top: 3px;
+    // padding-left: 3px;
+}
+
+// Cpu
+
+.iconcpu {
+    color: $base0D;
+    // margin: 2px 10px 0px 8px;
+    padding-top: 3px;
+    // padding-right: 12px;
+}
+
 .cpu_label {
     color: $base0D;
     padding-top: 3px;
 }
-.bat_label {
-    color: $base0E;
+
+// Volume
+.iconvol {
+    color: $base08;
+    // margin: 2px 10px 0px 8px;
     padding-top: 3px;
-    padding-left: 3px;
+    // padding-right: 4px;
+}
+
+.vol_label {
+    color: $base08;
+    padding-top: 3px;
+}
+
+//Brightness
+.iconbright {
+    color: $base09;
+    padding-top: 3px;
+    // padding-right: 8px;
 }
 .bright_icon {
     font-size: 18;
@@ -238,6 +264,7 @@ tooltip label {
     margin: 0px 15px 0px 3px;
 }
 
+//Disk
 .disk_label {
     color: $base09;
     padding-top: 3px;
@@ -246,7 +273,8 @@ tooltip label {
 .icondisk {
     font-size: 18;
     color: $base09;
-    margin: 3px 5px 0px 3px;
+    // margin: 3px 5px 0px 3px;
+    padding-top: 3px;
 }
 
 .separ {
@@ -256,26 +284,19 @@ tooltip label {
     margin: 0px 8px 0px 8px;
 }
 
-.launcher_module {
-    background-color: rgba(00, 00, 00, 0.0);
+.right_sep {
+    color: $base03;
+    font-weight: bold;
+    font-size: 14px;
+    margin-left: 8px;
+    margin-right: 8px;
 }
 
-.mem_module {
-    background-color: rgba(00, 00, 00, 0.0);
-    border-radius: 16px;
-    margin: 0px 5px 0px 0px;
-}
-
-.bat_module {
-    background-color: rgba(00, 00, 00, 0.0);
-    border-radius: 16px;
-    margin: 0px 0px 0px 5px;
-}
-
-.cpu_module {
-    background-color: rgba(00, 00, 00, 0.0);
-    border-radius: 16px;
-    margin: 0px 10px 0px 5px;
+.left_sep {
+    color: $base03;
+    font-weight: bold;
+    font-size: 14px;
+    margin-right: 0px;
 }
 
 .works {
@@ -285,30 +306,45 @@ tooltip label {
     background-color: rgba(00, 00, 00, 0.0);
 }
 
-.0, .01, .02, .03, .04, .05, .06,
-.011, .022, .033, .044, .055, .066 {
-    margin: 0px 15px 0px 0px;
-}
-
-.04 {
-    margin: 0px 2px 0px 0px;
-}
-
-/* Unoccupied */
-.0 {
+.empty_workspace {
     color: $base03;
 }
 
-/* Occupied */
-.01, .02, .03, .04, .05, .06, .07, .08, .09 {
+.occupied_workspace {
     color: $base05;
 }
 
-/* Focused */
-.011, .022, .033, .044, .055, .066, .077, .088, .099{
+.focused_workspace {
     color: $base0D;
 }
 
+.busy_workspace {
+}
+
+// .0, .01, .02, .03, .04, .05, .06,
+// .011, .022, .033, .044, .055, .066 {
+//     margin: 0px 15px 0px 0px;
+// }
+
+// .04 {
+//     margin: 0px 2px 0px 0px;
+// }
+
+// /* Unoccupied */
+// .0 {
+//     color: $base03;
+// }
+
+// /* Occupied */
+// .01, .02, .03, .04, .05, .06, .07, .08, .09 {
+//     color: $base05;
+// }
+
+// /* Focused */
+// .011, .022, .033, .044, .055, .066, .077, .088, .099{
+//     color: $base0D;
+// }
+
 
 // Calendar
 .cal {
diff --git a/.config/eww/eww.yuck b/.config/eww/eww.yuck
index aa82f82..ca253fb 100644
--- a/.config/eww/eww.yuck
+++ b/.config/eww/eww.yuck
@@ -32,8 +32,21 @@
 ;; widgets
 
 (defwidget workspaces []
-           (literal
-            :content workspace))
+           (eventbox
+            :onscroll "echo {} | sed -e 's/up/-1/g' -e 's/down/+1/g' | xargs hyprctl dispatch workspace"
+            :valign "center" 
+            (box
+             :class "works"
+             :orientation "h"
+             :spacing 5
+             :space-evenly "false"
+             :valign "center"
+              (button :onclick "hyprctl dispatch workspace 1" :class "0$o1$f1" "") 
+              (button :onclick "hyprctl dispatch workspace 2" :class "0$o2$f2" "") 
+              (button :onclick "hyprctl dispatch workspace 3" :class "0$o3$f3" "󰍨") 
+              (button :onclick "hyprctl dispatch workspace 4" :class "0$o4$f4" "󰈙"))))
+
+
 
 (defwidget appnames []
   (eventbox
@@ -83,7 +96,7 @@
        :text ESSID_WLAN))
      (button
       :class "module-wifi"
-      :onclick "networkmanager_dmenu"
+      :onclick "alacritty -e nmtui"
       WLAN_ICON))))
 
 (defwidget bat []
@@ -91,6 +104,7 @@
 	    :class "bat_module"
 	    :vexpand "false"
 	    :hexpand "false" 
+            :space-evenly true
             :spacing 0
             :visible {HOST == "kaladin" ? "false" : "true"}
             (button 
@@ -107,6 +121,7 @@
 	    :class "disk_module"
 	    :vexpand "false"
 	    :hexpand "false" 
+            :space-evenly true
             :spacing 0
             (button 
              :onclick "scripts/pop system"
@@ -122,6 +137,7 @@
 	    :class "bright_module"
 	    :vexpand "false"
 	    :hexpand "false" 
+            :space-evenly true
             :visible {HOST == "kaladin" ? "false" : "true"}
             (button 
              :class "iconbright"
@@ -138,6 +154,7 @@
 	    :class "vol_module"
 	    :vexpand "false"
 	    :hexpand "false" 
+            :space-evenly true
             (button 
              :class "iconvol"
              :onclick "scripts/pop audio"
@@ -152,6 +169,7 @@
 	    :class "cpu_module"
 	    :vexpand "false"
 	    :hexpand "false" 
+            ;; :space-evenly true
             (button 
              :onclick "scripts/pop system"
              :class "iconcpu"
@@ -164,7 +182,8 @@
 (defwidget mem []
 	   (box 
             :class "mem_module" 
-            :vexpand "false" 
+            :space-evenly true
+            :vexpand "true" 
             :hexpand "false" 
             (button 
              :onclick "scripts/pop system"
@@ -207,21 +226,17 @@
 (defwidget nextcloud_button []
   (box
     :class "notif_button"
-    :space-evenly "false"
     :orientation "h"
     (button
      :onclick "nextcloud"
       (label
-      :text "󰅠"))))
+       :text "󰅠"
+       :visible true))))
 
 (defwidget sep []
-  (box 
-    :class "separator"
-    :vexpand "false"
-    :hexpand "false"
-    (label
-        :class "separ"
-        :text "|")))
+           (label
+            :class "separ"
+            :text "|"))
 
 (defwidget gap []
   (box 
@@ -241,7 +256,7 @@
             :valign "center"
 	    :class "left_modules"
             :spacing 8
-            (workspaces)
+            ;; (workspaces)
             (appnames)))
 (defwidget center []
 	   (box 
@@ -256,14 +271,22 @@
 	    :space-evenly false  
             :halign "end"
 	    :class "right_modules"
-            (sep)
-            (disk)
-            (cpu)
-            (mem)
-            (volume)
-            (bright)
-            (bat)
-            (sep)
+            (label
+             :class "left_sep"
+             :text "|")
+            (box
+             :orientation "h"
+             :space-evenly true
+             :class "sysmodules"
+             (disk)
+             (cpu)
+             (mem)
+             (volume)
+             (bright)
+             (bat))
+            (label
+             :class "right_sep"
+             :text "|")
             (wifi)
             (notif_button)
             (nextcloud_button)))
@@ -315,255 +338,255 @@
 
 
 
-(defwidget audio []
-	(box 
-	    :class "audio-box"
-	    :orientation "v"
-	    :space-evenly "false"
-	    :vexpand "false"
-	    :hexpand "false"
-	    (box 
-	        :halign "v"
-	        :space-evenly "false"
-	        :hexpand "false"
-	        :vexpand "false"
-	        (box 
-	            :class "speaker_icon"
-	            :orientation "v")
-	        (box 
-	            :orientation "v"
-	            :halign "center"
-	            :vexpand "false"
-	            :hexpand "false"
-                (label
-                    :class "speaker_text"
-                    :text "speaker"
-                    :valign "center"
-                    :halign "left" )
-	            (box
-	                :class "speaker_bar"
-	                :halign "center"
-	                :vexpand "false"
-	                :hexpand "false"
-	                (scale
-	                  :value volume_percent
-			  :orientation "h"
-			  :onchange "amixer -D pulse sset Master {}%" 
-                          :tooltip "volume on ${volume_percent}%"
-			  :max 100
-			  :min 0))))
-        (label
-            :text "_____________________________________"
-            :class "audio_sep"
-            :halign "center")
-	    (box 
-	        :halign "v"
-	        :space-evenly "false"
-	        :hexpand "false"
-	        :vexpand "false"
-	        (box 
-	            :class "mic_icon"
-	            :orientation "v")
-	            (box 
-	                :orientation "v"
-	                :halign "center"
-	                :vexpand "false"
-	                :hexpand "false"
-                    (label
-                        :class "mic_text"
-                        :text "mic"
-                        :valign "center"
-                        :halign "left" )
-	                (box 
-	                    :class "mic_bar"
-	                    :halign "center"
-	                    :vexpand "false"
-	                    :hexpand "false"
-	                    (scale
-	                     :value mic_percent
-			     :orientation "h"
-                             :tooltip "mic on ${mic_percent}%"
-			     :onchange "amixer -D pulse sset Capture {}%" 
-			     :max 100
-			     :min 0))))))
-(defwindow audio_ctl
-    :stacking "fg"
-    :focusable "false"
-    :screen 1
-    :monitor 0
-	:geometry (geometry 
-        :x "20" 
-		:y "7%" 
-        :anchor "top right"
-		:width "280px" 
-		:height "60px")
-    (audio))
+;; (defwidget audio []
+;; 	(box 
+;; 	    :class "audio-box"
+;; 	    :orientation "v"
+;; 	    :space-evenly "false"
+;; 	    :vexpand "false"
+;; 	    :hexpand "false"
+;; 	    (box 
+;; 	        :halign "v"
+;; 	        :space-evenly "false"
+;; 	        :hexpand "false"
+;; 	        :vexpand "false"
+;; 	        (box 
+;; 	            :class "speaker_icon"
+;; 	            :orientation "v")
+;; 	        (box 
+;; 	            :orientation "v"
+;; 	            :halign "center"
+;; 	            :vexpand "false"
+;; 	            :hexpand "false"
+;;                 (label
+;;                     :class "speaker_text"
+;;                     :text "speaker"
+;;                     :valign "center"
+;;                     :halign "left" )
+;; 	            (box
+;; 	                :class "speaker_bar"
+;; 	                :halign "center"
+;; 	                :vexpand "false"
+;; 	                :hexpand "false"
+;; 	                (scale
+;; 	                  :value volume_percent
+;; 			  :orientation "h"
+;; 			  :onchange "amixer -D pulse sset Master {}%" 
+;;                           :tooltip "volume on ${volume_percent}%"
+;; 			  :max 100
+;; 			  :min 0))))
+;;         (label
+;;             :text "_____________________________________"
+;;             :class "audio_sep"
+;;             :halign "center")
+;; 	    (box 
+;; 	        :halign "v"
+;; 	        :space-evenly "false"
+;; 	        :hexpand "false"
+;; 	        :vexpand "false"
+;; 	        (box 
+;; 	            :class "mic_icon"
+;; 	            :orientation "v")
+;; 	            (box 
+;; 	                :orientation "v"
+;; 	                :halign "center"
+;; 	                :vexpand "false"
+;; 	                :hexpand "false"
+;;                     (label
+;;                         :class "mic_text"
+;;                         :text "mic"
+;;                         :valign "center"
+;;                         :halign "left" )
+;; 	                (box 
+;; 	                    :class "mic_bar"
+;; 	                    :halign "center"
+;; 	                    :vexpand "false"
+;; 	                    :hexpand "false"
+;; 	                    (scale
+;; 	                     :value mic_percent
+;; 			     :orientation "h"
+;;                              :tooltip "mic on ${mic_percent}%"
+;; 			     :onchange "amixer -D pulse sset Capture {}%" 
+;; 			     :max 100
+;; 			     :min 0))))))
+;; (defwindow audio_ctl
+;;     :stacking "fg"
+;;     :focusable "false"
+;;     :screen 1
+;;     :monitor 0
+;; 	:geometry (geometry 
+;;         :x "20" 
+;; 		:y "7%" 
+;;         :anchor "top right"
+;; 		:width "280px" 
+;; 		:height "60px")
+;;     (audio))
 
 
-;;Define System widget  
-(defwidget system []
-  (box 
-    :class "sys_win"
-    :orientation "v"
-    :space-evenly "false"
-    :hexpand "false"
-    :vexpand "false"
-    :spacing 0
-    (box 
-        :class "sys_bat_box"
-        :orientation "h"
-        :space-evenly "false"
-        (circular-progress
-            :value {EWW_BATTERY["BAT1"].capacity}
-            :class "sys_bat"
-            :thickness 9
-            (label :text ""
-                :class "sys_icon_bat"
-                :limit-width 2
-                :wrap false))
-        (box 
-            :orientation "v" 
-            :space-evenly "false" 
-            :spacing 0 
-            :hexpand "false"
-            :vexpand "false"
-            (label
-                :text "battery"
-                :halign "start"
-                :class "sys_text_bat"
-                :limit-width 9
-                :wrap false)
-            (label 
-                :text "${EWW_BATTERY["BAT1"].capacity}%"
-                :halign "start"
-                :class "sys_text_bat_sub"
-                :limit-width 22
-                :wrap false)
-            (label :text "${EWW_BATTERY["BAT1"].status}"
-                :halign "start"
-                :class "sys_text_bat_sub"
-                :limit-width 22
-                :wrap false)))
-    (label
-        :text "____________________________________"
-        :class "sys_sep"
-        :halign "center")
-    (box 
-        :class "sys_mem_box"
-        :orientation "h"
-        :space-evenly "false"
-        :halign "start"
-        (circular-progress
-            :value {EWW_CPU.avg}
-            :class "sys_mem"
-            :thickness 9
-            (label
-                :text ""
-                :class "sys_icon_mem"
-                :limit-width 2
-                :wrap false
-                :angle 0.0))
-        (box
-            :orientation "v"
-            :space-evenly "false"
-            :spacing 0
-            :hexpand "false"
-            :vexpand "false"
-            (label
-                :text "processor"
-                :halign "start"
-                :class "sys_text_mem"
-                :limit-width 9
-                :wrap false)
-            (label
-                :text "${EWW_CPU.avg} | ${round((EWW_RAM.total_mem / 1024), 0)}mb "
-                :halign "start"
-                :class "sys_text_mem_sub"
-                :limit-width 22
-                :wrap false)
-            (label :text "3.4 GHZ"
-                :halign "start"
-                :class "sys_text_mem_sub"
-                :limit-width 22
-                :wrap false)
-            ))
-    (label
-        :text "____________________________________"
-        :class "sys_sep"
-        :halign "center")
-    (box 
-        :class "sys_mem_box"
-        :orientation "h"
-        :space-evenly "false"
-        :halign "start"
-        (circular-progress
-            :value {EWW_RAM.used_mem_perc}
-            :class "sys_mem"
-            :thickness 9
-            (label
-                :text ""
-                :class "sys_icon_mem"
-                :limit-width 2
-                :wrap false
-                :angle 0.0))
-        (box
-            :orientation "v"
-            :space-evenly "false"
-            :spacing 0
-            :hexpand "false"
-            :vexpand "false"
-            (label
-                :text "memory"
-                :halign "start"
-                :class "sys_text_mem"
-                :limit-width 9
-                :wrap false)
-            (label
-                :text "${round((EWW_RAM.available_mem / 1024), 0)} | ${round((EWW_RAM.total_mem / 1024), 0)}mb "
-                :halign "start"
-                :class "sys_text_mem_sub"
-                :limit-width 22
-                :wrap false)
-            (label :text "${round((EWW_RAM.used_mem / 1024), 0)}mb free"
-                :halign "start"
-                :class "sys_text_mem_sub"
-                :limit-width 22
-                :wrap false)
-            ))))
-(defwindow system
-    :stacking "fg"
-    :focusable "false"
-    :screen 1
-    :monitor 0
-    :geometry (geometry
-               :x "20" 
-               :y "0" 
-               :anchor "bottom right"
-               :width "290px" 
-               :height "120px")
-    (system))
+;; ;;Define System widget  
+;; (defwidget system []
+;;   (box 
+;;     :class "sys_win"
+;;     :orientation "v"
+;;     :space-evenly "false"
+;;     :hexpand "false"
+;;     :vexpand "false"
+;;     :spacing 0
+;;     (box 
+;;         :class "sys_bat_box"
+;;         :orientation "h"
+;;         :space-evenly "false"
+;;         (circular-progress
+;;             :value {EWW_BATTERY["BAT1"].capacity}
+;;             :class "sys_bat"
+;;             :thickness 9
+;;             (label :text ""
+;;                 :class "sys_icon_bat"
+;;                 :limit-width 2
+;;                 :wrap false))
+;;         (box 
+;;             :orientation "v" 
+;;             :space-evenly "false" 
+;;             :spacing 0 
+;;             :hexpand "false"
+;;             :vexpand "false"
+;;             (label
+;;                 :text "battery"
+;;                 :halign "start"
+;;                 :class "sys_text_bat"
+;;                 :limit-width 9
+;;                 :wrap false)
+;;             (label 
+;;                 :text "${EWW_BATTERY["BAT1"].capacity}%"
+;;                 :halign "start"
+;;                 :class "sys_text_bat_sub"
+;;                 :limit-width 22
+;;                 :wrap false)
+;;             (label :text "${EWW_BATTERY["BAT1"].status}"
+;;                 :halign "start"
+;;                 :class "sys_text_bat_sub"
+;;                 :limit-width 22
+;;                 :wrap false)))
+;;     (label
+;;         :text "____________________________________"
+;;         :class "sys_sep"
+;;         :halign "center")
+;;     (box 
+;;         :class "sys_mem_box"
+;;         :orientation "h"
+;;         :space-evenly "false"
+;;         :halign "start"
+;;         (circular-progress
+;;             :value {EWW_CPU.avg}
+;;             :class "sys_mem"
+;;             :thickness 9
+;;             (label
+;;                 :text ""
+;;                 :class "sys_icon_mem"
+;;                 :limit-width 2
+;;                 :wrap false
+;;                 :angle 0.0))
+;;         (box
+;;             :orientation "v"
+;;             :space-evenly "false"
+;;             :spacing 0
+;;             :hexpand "false"
+;;             :vexpand "false"
+;;             (label
+;;                 :text "processor"
+;;                 :halign "start"
+;;                 :class "sys_text_mem"
+;;                 :limit-width 9
+;;                 :wrap false)
+;;             (label
+;;                 :text "${EWW_CPU.avg} | ${round((EWW_RAM.total_mem / 1024), 0)}mb "
+;;                 :halign "start"
+;;                 :class "sys_text_mem_sub"
+;;                 :limit-width 22
+;;                 :wrap false)
+;;             (label :text "3.4 GHZ"
+;;                 :halign "start"
+;;                 :class "sys_text_mem_sub"
+;;                 :limit-width 22
+;;                 :wrap false)
+;;             ))
+;;     (label
+;;         :text "____________________________________"
+;;         :class "sys_sep"
+;;         :halign "center")
+;;     (box 
+;;         :class "sys_mem_box"
+;;         :orientation "h"
+;;         :space-evenly "false"
+;;         :halign "start"
+;;         (circular-progress
+;;             :value {EWW_RAM.used_mem_perc}
+;;             :class "sys_mem"
+;;             :thickness 9
+;;             (label
+;;                 :text ""
+;;                 :class "sys_icon_mem"
+;;                 :limit-width 2
+;;                 :wrap false
+;;                 :angle 0.0))
+;;         (box
+;;             :orientation "v"
+;;             :space-evenly "false"
+;;             :spacing 0
+;;             :hexpand "false"
+;;             :vexpand "false"
+;;             (label
+;;                 :text "memory"
+;;                 :halign "start"
+;;                 :class "sys_text_mem"
+;;                 :limit-width 9
+;;                 :wrap false)
+;;             (label
+;;                 :text "${round((EWW_RAM.available_mem / 1024), 0)} | ${round((EWW_RAM.total_mem / 1024), 0)}mb "
+;;                 :halign "start"
+;;                 :class "sys_text_mem_sub"
+;;                 :limit-width 22
+;;                 :wrap false)
+;;             (label :text "${round((EWW_RAM.used_mem / 1024), 0)}mb free"
+;;                 :halign "start"
+;;                 :class "sys_text_mem_sub"
+;;                 :limit-width 22
+;;                 :wrap false)
+;;             ))))
+;; (defwindow system
+;;     :stacking "fg"
+;;     :focusable "false"
+;;     :screen 1
+;;     :monitor 0
+;;     :geometry (geometry
+;;                :x "20" 
+;;                :y "0" 
+;;                :anchor "bottom right"
+;;                :width "290px" 
+;;                :height "120px")
+;;     (system))
 
 
 
-;;Calendar Widget
-(defwidget cal []
-	(box 
-	    :class "cal"
-	    :orientation "v"
-	    (box
-	     :class "cal-in"
-	     (calendar
-	      :day calendar_day 
-	      :year calendar_year))))
-(defwindow calendar
-    :stacking "fg"
-    :focusable "false"
-    :screen 1
-    :monitor 0
-    :geometry (geometry
-               :x "20" 
-               :y "0" 
-               :anchor "bottom right"
-	       :width "270px" 
-	       :height "60px")
-    (cal))
+;; ;;Calendar Widget
+;; (defwidget cal []
+;; 	(box 
+;; 	    :class "cal"
+;; 	    :orientation "v"
+;; 	    (box
+;; 	     :class "cal-in"
+;; 	     (calendar
+;; 	      :day calendar_day 
+;; 	      :year calendar_year))))
+;; (defwindow calendar
+;;     :stacking "fg"
+;;     :focusable "false"
+;;     :screen 1
+;;     :monitor 0
+;;     :geometry (geometry
+;;                :x "20" 
+;;                :y "0" 
+;;                :anchor "bottom right"
+;; 	       :width "270px" 
+;; 	       :height "60px")
+;;     (cal))
diff --git a/.config/eww/scripts/nextcloud.sh b/.config/eww/scripts/nextcloud.sh
new file mode 100644
index 0000000..f1f641a
--- /dev/null
+++ b/.config/eww/scripts/nextcloud.sh
@@ -0,0 +1 @@
+#!/usr/bin/env bash
diff --git a/.config/eww/scripts/wks b/.config/eww/scripts/wks
new file mode 100755
index 0000000..1631f65
--- /dev/null
+++ b/.config/eww/scripts/wks
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+focused_workspace () {
+    hyprctl monitors | grep -B 5 "focused: yes" | awk 'NR == 1{print $3}'
+}
+
+occupied_workspace () {
+    hyprctl workspaces
+}
+
+case $1 in
+    fw)
+        focused_workspace
+        ;;
+    ow)
+        occupied_workspace
+        ;;
+esac
diff --git a/.config/eww/scripts/workspace b/.config/eww/scripts/workspace
index c40f04b..0e1d25b 100755
--- a/.config/eww/scripts/workspace
+++ b/.config/eww/scripts/workspace
@@ -50,11 +50,11 @@ fi
 module() {
 #output eww widget
 echo 	"(eventbox :onscroll \"echo {} | sed -e 's/up/-1/g' -e 's/down/+1/g' | xargs hyprctl dispatch workspace\" :valign \"center\" \
-          (box	:class \"works\"	:orientation \"h\" :spacing 5 :space-evenly \"false\" :valign \"center\"	\
-              (button :onclick \"hyprctl dispatch workspace  1\" :onrightclick \"hyprctl dispatch workspace 1 && $HOME/.config/hypr/themes/neon/scripts/default_app\" :class \"0$o1$f1\" \"${ic[1]}\") \
-              (button :onclick \"hyprctl dispatch workspace  2\" :onrightclick \"hyprctl dispatch workspace 2 && $HOME/.config/hypr/themes/neon/scripts/default_app\" :class \"0$o2$f2\" \"${ic[2]}\") \
-              (button :onclick \"hyprctl dispatch workspace 3\" :onrightclick \"hyprctl dispatch workspace 3 && $HOME/.config/hypr/themes/neon/scripts/default_app\" :class \"0$o3$f3\" \"${ic[3]}\") \
-              (button :onclick \"hyprctl dispatch workspace 4\" :onrightclick \"hyprctl dispatch workspace 4 && $HOME/.config/hypr/themes/neon/scripts/default_app\" :class \"0$o4$f4\" \"${ic[4]}\") \
+          (box	:class \"works\" :orientation \"h\" :spacing 5 :space-evenly \"false\" :valign \"center\"	\
+              (button :onclick \"hyprctl dispatch workspace 1\" :class \"0$o1$f1\" \"${ic[1]}\") \
+              (button :onclick \"hyprctl dispatch workspace 2\" :class \"0$o2$f2\" \"${ic[2]}\") \
+              (button :onclick \"hyprctl dispatch workspace 3\" :class \"0$o3$f3\" \"${ic[3]}\") \
+              (button :onclick \"hyprctl dispatch workspace 4\" :class \"0$o4$f4\" \"${ic[4]}\") \
           )\
         )"
 }