diff --git a/.config/conky/cmus-country.sh b/.config/conky/cmus-country.sh index ef13be6..9229582 100755 --- a/.config/conky/cmus-country.sh +++ b/.config/conky/cmus-country.sh @@ -255,14 +255,10 @@ language+=([en]="English"); language+=([fr]="Français"); language+=([no]="Norsk"); language+=([se]="Svenska"); -language+=([it]="Italiano"); if cmus-remote -Q &>/dev/null ; then COMMENT=$( cmus-remote -Q | grep "tag comment " | cut -d " " -f 3- ) LANGUAGE=$( echo $COMMENT | sed 's/.*lang:\(.\{2\}\).*/\1/') - if [ "$LANGUAGE" = "$COMMENT" ]; then - LANGUAGE=""; - fi COUNTRY=$( echo $COMMENT | sed 's/.*country:\(.\{2\}\).*/\1/') if [ ! -z "$LANGUAGE" ] && [ ! -z "$COUNTRY" ]; then echo "${language[$LANGUAGE]}, ${country[$COUNTRY]}" diff --git a/.config/conky/conky.conf b/.config/conky/conky.conf index 0fc4c0f..e7d42b6 100644 --- a/.config/conky/conky.conf +++ b/.config/conky/conky.conf @@ -144,8 +144,8 @@ ${downspeedgraph enp0s31f6 25,160 99cc33 006600}$alignr${upspeedgraph enp0s31f6 #Credit to Reddit user: /u/Rioku_jk ############################################## ${color0}${font sans-serif:bold:size=8}MUSIC ${hr 2}$color -$font${if_running cmus}${exec cmus-remote -Q 2>/dev/null | grep 'tag artist ' | cut -d " " -f 3-} $alignr ${exec ~/.config/conky/cmus-country.sh} -${exec cmus-remote -Q 2>/dev/null | grep 'tag genre ' | cut -d " " -f 3-} +$font${if_running cmus}${exec cmus-remote -Q 2>/dev/null | grep 'tag artist ' | cut -d " " -f 3-} $alignr ${exec cmus-remote -Q 2>/dev/null | grep 'tag genre ' | cut -d " " -f 3-} +${exec ~/.config/conky/cmus-country.sh} ${exec cmus-remote -Q 2>/dev/null | grep 'date' | cut -d " " -f 3-} - ${exec cmus-remote -Q 2>/dev/null | grep 'tag album ' | cut -d " " -f 3-} ${exec cmus-remote -Q | grep tracknumber | cut -d " " -f 3}. ${exec cmus-remote -Q 2>/dev/null | grep 'title' | cut -d " " -f 3-} ${execbar ~/.config/conky/cmus-conky-timebar.sh}${color white}