From 46a74bdbb51e0c672eb39e41aca3d08abad29747 Mon Sep 17 00:00:00 2001
From: coolnsx <ansari.tan20@gmail.com>
Date: Sun, 3 Sep 2023 22:08:51 +0530
Subject: [PATCH] This really should not take 19 minutes to build.

---
 eww/eww.scss |  7 ++++++-
 eww/eww.yuck | 47 ++++++++++++++++++-----------------------------
 eww/script   |  2 +-
 3 files changed, 25 insertions(+), 31 deletions(-)

diff --git a/eww/eww.scss b/eww/eww.scss
index af37cdf..0bc17b0 100644
--- a/eww/eww.scss
+++ b/eww/eww.scss
@@ -40,12 +40,13 @@
 	color: #8FBCBB;
 	font-size : 24px;
 	font-weight : bold;
-	margin : 10px 0px 0px 0px;
+	margin : 30px 0px 0px 0px;
 }
 .artist {
 	color: #EBCB8B;
 	font-size : 20px;
 	font-weight : normal;
+	margin : 0px 0px -20px 0px;
 }
 .btn_play {
 	color: #A3BE8C;
@@ -63,6 +64,10 @@
 .btn_controls:hover {
 	font-size : 50px;
 }
+.lyrics {
+	color: #EBCB8B;
+	margin : -10px 0px 0px 0px;
+}
 .music_bar {
 	color: #81A1C1;
 	background-color: rgba(0,0,0,0.1);
diff --git a/eww/eww.yuck b/eww/eww.yuck
index c319da4..3849acc 100644
--- a/eww/eww.yuck
+++ b/eww/eww.yuck
@@ -10,8 +10,7 @@
            :reserve (struts :distance "40px" :side "top")
            :windowtype "dock"
            :wm-ignore false
-     (clock)
-)
+     (clock))
 
 (defwindow time_0
            :monitor 0
@@ -24,13 +23,12 @@
            :reserve (struts :distance "40px" :side "top")
            :windowtype "dock"
            :wm-ignore false
-     (clock)
-)
+     (clock))
 
-(defpoll HOUR :interval "2s" $(date +'%I'))
-(defpoll MIN :interval "2s" $(date +'%M'))
-(defpoll MER :interval "2s" $(date +'%p'))
-(defpoll DAY :interval "5s" $(date +'%A'))
+(defpoll HOUR :interval "2s" `date +'%I'`)
+(defpoll MIN :interval "2s" `date +'%M'`)
+(defpoll MER :interval "2s" `date +'%p'`)
+(defpoll DAY :interval "5s" `date +'%A'`)
 
 (defwidget clock [] 
       (box :class "genwin" :orientation "h" :spacing 50 :space-evenly false :vexpand "false" :hexpand "false" 
@@ -39,10 +37,7 @@
                   (label :class "time_min" :valign "end" :wrap "true" :limit-width 25 :text MIN))
             (box :orientation "v" :spacing 0 :space-evenly true
                   (label :class "time_mer" :valign "start" :halign "end" :wrap "true" :limit-width 25 :text MER)
-                  (label :class "time_day" :valign "end" :halign "end" :wrap "true" :limit-width 25 :text DAY)
-            )
-      )
-)
+                  (label :class "time_day" :valign "end" :halign "end" :wrap "true" :limit-width 25 :text DAY))))
 
 ;; music
 (defwindow music_0
@@ -56,8 +51,7 @@
            :reserve (struts :distance "10px" :side "bottom")
            :windowtype "dock"
            :wm-ignore true
-     (music)
-)
+     (music))
 
 (defwindow music_1
            :monitor 1
@@ -70,32 +64,27 @@
            :reserve (struts :distance "10px" :side "bottom")
            :windowtype "dock"
            :wm-ignore true
-     (music)
-)
+     (music))
 
-(defpoll SONG :interval "2s" $(./script song))
-(defpoll ARTIST :interval "2s" $(./script artist))
-(defpoll STATUS :interval "0.4s" $(./script status))
-(defpoll COVER :interval "2s" $(./script cover))
-(defpoll CURRENT :interval "0.4s" $(./script time))
-(defpoll LYRICS :interval "0.4s" $(./script lyrics))
+(defpoll SONG :interval "2s" `./script song`)
+(defpoll ARTIST :interval "2s" `./script artist`)
+(defpoll STATUS :interval "0.4s" `./script status`)
+(defpoll COVER :interval "2s" `./script cover`)
+(defpoll CURRENT :interval "0.4s" `./script time`)
+(defpoll LYRICS :interval "0.4s" `./script lyrics`)
 
 (defwidget music []
       (box :class "genwin" :orientation "h" :spacing 50 :space-evenly "false" :vexpand "false" :hexpand "false" 
             (box :class "box_art" :vexpand "false" :hexpand "false"
                   (circular-progress :class "music_bar" :value CURRENT :thickness 10 :clockwise true :start-at 75 
                         (image :path COVER :image-height 300 :image-width 300)))
-            (box :orientation "v" :spacing 15 :space-evenly "false" :vexpand "false" :hexpand "false" 
+            (box :orientation "v" :spacing 20 :space-evenly "false" :vexpand "false" :hexpand "false" 
                   (label :halign "center" :class "song" :wrap "false" :limit-width 30 :text SONG)
                   (label :halign "center" :class "artist" :wrap "false" :text ARTIST)
-                  (box :orientation "h" :spacing 20 :halign "center" :space-evenly "true" :vexpand "false" :hexpand "false" 
+                  (box :orientation "h" :spacing 30 :halign "center" :space-evenly "true" :vexpand "false" :hexpand "false" 
                         (button :class "btn_controls" :onclick "./script prev" "玲")
                         (button :class "btn_controls" :onclick "./script seek '-1'" "")
                         (button :class "btn_play" :onclick "./script play_toggle" STATUS)
                         (button :class "btn_controls" :onclick "./script seek '1'" "")
                         (button :class "btn_controls" :onclick "./script next" "怜"))
-                  (label :halign "center" :wrap "true" :class "artist" :text LYRICS)
-            )
-      )
-)
-
+                  (label :halign "center" :wrap "true" :class "lyrics" :text LYRICS))))
diff --git a/eww/script b/eww/script
index 66a11ec..6fc7992 100755
--- a/eww/script
+++ b/eww/script
@@ -4,7 +4,7 @@ out=$(printf '{ "command": ["get_property", "pause"]}\n' | socat - /tmp/mpvsocke
 case $1 in
 	song)
 		if [ -n "$out" ] && pgrep -f mpvsocket >/dev/null 2>&1;then
-			cut -d'>' -f1 < "/tmp/yt-music/current" | cut -d':' -f2 | sed 's|[^-]*$||;s|-$||'
+			cut -d'>' -f1 < "/tmp/yt-music/current" | cut -d':' -f2 | sed 's|[^-]*$||;s|[-| ]$||'
 		else
 			printf "OFFLINE"
 		fi