2 files changed, 19 insertions, 38 deletions

diff --git a/polybar/.config/polybar/cmus.sh b/polybar/.config/polybar/cmus.sh
deleted file mode 100755
index 7917d4c..0000000
--- a/polybar/.config/polybar/cmus.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-prepend_zero () {
-        seq -f "%02g" $1 $1
-}
-
-artist=$(echo -n $(cmus-remote -C status | grep "tag artist" | cut -c 12-))
-
-if [[ $artist = *[!\ ]* ]]; then
-        song=$(echo -n $(cmus-remote -C status | grep title | cut -c 11-))
-        position=$(cmus-remote -C status | grep position | cut -c 10-)
-        minutes1=$(prepend_zero $(($position / 60)))
-        seconds1=$(prepend_zero $(($position % 60)))
-        duration=$(cmus-remote -C status | grep duration | cut -c 10-)
-        minutes2=$(prepend_zero $(($duration / 60)))
-        seconds2=$(prepend_zero $(($duration % 60)))
-        echo -n "$artist - $song [$minutes1:$seconds1/$minutes2:$seconds2]"
-else
-        echo
-fi
diff --git a/polybar/.config/polybar/config b/polybar/.config/polybar/config
index 8f9701d..8260bc9 100644
--- a/polybar/.config/polybar/config
+++ b/polybar/.config/polybar/config
@@ -35,7 +35,7 @@ font-0 = Hermit:style=medium:pixelsize=10;1
 font-1 = FontAwesome:style=Regular:size=10;1
 modules-left = pulseaudio battery date time bspwm
 modules-center = 
-modules-right = spotify cmus xwindow
+modules-right = spotify mpd
 tray-position = right
 cursor-click = pointer
 cursor-scroll = ns-resize
@@ -152,26 +152,26 @@ format = <label>
 format-foreground = #7b8c58
 exec = python ~/.config/polybar/spotify.py -f '{artist}: {song}'
 
-[module/cmus]
-type = custom/script
-exec = ~/.config/polybar/cmus.sh
-exec-if = pgrep -x cmus
-interval = 1
-click-left = cmus-remote --next
-click-right = cmus-remote --prev
-click-middle = cmus-remote --pause
-scroll-up = cmus-remote --volume +5%
-scroll-down = cmus-remote --volume -5%
-format = <label>
-format-prefix = " "
-format-foreground = #7b8c58
-label = %output%
-label-maxlen = 50
+;[module/cmus]
+;type = custom/script
+;exec = ~/.config/polybar/cmus.sh
+;exec-if = pgrep -x cmus
+;interval = 1
+;click-left = cmus-remote --next
+;click-right = cmus-remote --prev
+;click-middle = cmus-remote --pause
+;scroll-up = cmus-remote --volume +5%
+;scroll-down = cmus-remote --volume -5%
+;format = <label>
+;format-prefix = " "
+;format-foreground = #7b8c58
+;label = %output%
+;label-maxlen = 50
 
 [module/mpd]
 type = internal/mpd
 label-offline = mpd is offline
-format-online = <label-song> <icon-prev> <toggle> <icon-next> 
+format-online = <label-song>  <icon-prev> <toggle> <icon-next> 
 format-offline = <label-offline>
 host = 127.0.0.1
 port = 6600
@@ -180,8 +180,9 @@ icon-stop = 
 icon-play = 
 icon-pause = 
 icon-next = 
-label-song-maxlen = 25
+label-song-maxlen = 40
 label-song-ellipsis = true
+label-song-foreground = #7b8c58
 bar-progress-width = 10
 bar-progress-indicator = |
 bar-progress-fill = ─