From 9fea28480afc529456b959c50a1ee630520905b9 Mon Sep 17 00:00:00 2001 From: Alexander Sulfrian Date: Tue, 4 Sep 2012 16:15:32 +0200 Subject: bin/sound.sh: remove bashism --- bin/sound.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/sound.sh b/bin/sound.sh index 382c461..5153375 100644 --- a/bin/sound.sh +++ b/bin/sound.sh @@ -1,11 +1,11 @@ -function print_mute { +print_mute() { local stat VOL MUTE - stat=$(amixer -c0 get Master | grep "Front Left:") - VOL=$(sed 's/^.*\[\(.*\)%\].*$/\1/g' <<< "${stat}") - MUTE=$(sed 's/^.*\[\([^\[]*\)\]$/\1/g' <<< "${stat}") + stat=$(amixer -c0 get Master | grep "\(Mono\|Front Left\):") + VOL=$(echo "${stat}" | sed 's/^.*\[\(.*\)%\].*$/\1/g') + MUTE=$(echo "${stat}" | sed 's/^.*\[\([^\[]*\)\]$/\1/g') - if [ "${MUTE}" == "off" -o "${MUTE}" == "0" ] + if [ "${MUTE}" = "off" -o "${MUTE}" = "0" ] then echo "^tw()^fg(#FF0000)^i(${HOME}/.dzen2/icons/vol-mute.xbm)" else -- cgit v1.2.3 From 6a6e58b50f13d337cf80351a74b494546f7cd72f Mon Sep 17 00:00:00 2001 From: Alexander Sulfrian Date: Tue, 4 Sep 2012 16:16:10 +0200 Subject: bin: ignore external binaries --- bin/.gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 bin/.gitignore diff --git a/bin/.gitignore b/bin/.gitignore new file mode 100644 index 0000000..8174972 --- /dev/null +++ b/bin/.gitignore @@ -0,0 +1,2 @@ +xrandr-notify +xinerama-resolution -- cgit v1.2.3 From 142dc77652bc04b08dac8f35b24949d4fe6a3823 Mon Sep 17 00:00:00 2001 From: Alexander Sulfrian Date: Tue, 4 Sep 2012 16:18:30 +0200 Subject: bin/clock.sh: use gcal if available --- bin/clock.sh | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/bin/clock.sh b/bin/clock.sh index 5b54a6a..3c67a8e 100644 --- a/bin/clock.sh +++ b/bin/clock.sh @@ -9,16 +9,23 @@ do if [ $TODAY -ne $OLD_TODAY ] then - MONTH=`date +'%m' | sed "s/^0//"` - YEAR=`date +'%Y'` + MONTH=$(date +'%_m') + YEAR=$(date +'%Y') [ $MONTH -eq 12 ] && YEAR=$(($YEAR + 1)) OLD_TODAY=$TODAY echo "^cs()" - echo - cal -m | sed "s/$/ /;s/^\(.\{20\}\).*$/\1/" | sed -u -re "s/(^|[ ])($TODAY)($|[ ])/\1^fg(#ff0000)\2^fg()\3/" - echo " " - cal -m $((($MONTH % 12) +1)) $YEAR | sed "s/$/ /;s/^\(.\{20\}\).*$/\1/" + if hash gcal 2>/dev/null; then + echo + gcal --cc-holidays=DE_BE --starting-day=Mon "${MONTH}" | sed "s/<\(\( \|[0-9]\)[0-9]\)>/ ^fg(#ff0000)\1^fg() /;s/:\(\( \|[0-9]\)[0-9]\):/ ^fg(#ffff00)\1^fg() /;/^[ \t]*$/d" + echo " " + gcal --cc-holidays=DE_BE --starting-day=Mon "$((($MONTH % 12) +1))" "$YEAR" | sed "s/<\(\( \|[0-9]\)[0-9]\)>/ ^fg(#ff0000)\1^fg() /;s/:\(\( \|[0-9]\)[0-9]\):/ ^fg(#ffff00)\1^fg() /;/^[ \t]*$/d" + else + echo + cal -m ${MONTH} | sed "s/$/ /;s/^\(.\{20\}\).*$/\1/" | sed -u -re "s/(^|[ ])($TODAY)($|[ ])/\1^fg(#ff0000)\2^fg()\3/" + echo " " + cal -m $((($MONTH % 12) +1)) $YEAR | sed "s/$/ /;s/^\(.\{20\}\).*$/\1/" + fi fi sleep 1 -- cgit v1.2.3 From ff660e44627550250801eb7b2011163e4ddc2b35 Mon Sep 17 00:00:00 2001 From: Alexander Sulfrian Date: Tue, 4 Sep 2012 16:24:24 +0200 Subject: bin/dzen2_pgrp.sh: adjust dzen2 instances with screen width --- bin/dzen2_pgrp.sh | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/bin/dzen2_pgrp.sh b/bin/dzen2_pgrp.sh index 05c186e..63fa325 100644 --- a/bin/dzen2_pgrp.sh +++ b/bin/dzen2_pgrp.sh @@ -1,19 +1,29 @@ #!/bin/sh DIR="${HOME}/.dzen2/" FONT="-*-terminus-medium-r-normal-*-12-*-*-*-*-*-*-*" +SCREEN=1 -cat $* | dzen2 -xs 1 -x 0 -w 1223 -ta l -fn "${FONT}" -bg black -e 'button1=none' & -MAIN=$! +# get width of screen +OFFSET=$(${DIR}/bin/xinerama-resolution ${SCREEN} | cut -dx -f1) + +CLOCK_WIDTH=$(textwidth "$FONT" "$(date)") +OFFSET=$((OFFSET - $CLOCK_WIDTH - 20)) +sh "${DIR}/bin/clock.sh" | dzen2 -xs ${SCREEN} -x ${OFFSET} -w $(($CLOCK_WIDTH + 20)) -fn "${FONT}" -bg black -l 17 -p -sa c -e 'button1=exec:xscreensaver-command -lock;button3=exec:xcalendar;button2=exec:xscreensaver-command -prefs;onstart=collapse;entertitle=uncollapse,unhide;leavetitle=collapse' & -sh "${DIR}/bin/bat.sh" | dzen2 -xs 1 -x 1360 -w 120 -fn "${FONT}" -bg black -e 'button1=none' & +OFFSET=$((OFFSET - 120)) +sh "${DIR}/bin/bat.sh" | dzen2 -xs ${SCREEN} -x ${OFFSET} -w 120 -fn "${FONT}" -bg black -e 'button1=none' & -sh "${DIR}/bin/clock.sh" | dzen2 -xs 1 -x 1480 -w 200 -fn "${FONT}" -bg black -l 17 -p -sa c -e 'button1=exec:xscreensaver-command -lock;button3=exec:xcalendar;button2=exec:xscreensaver-command -prefs;onstart=collapse;entertitle=uncollapse,unhide;leavetitle=collapse' & - +OFFSET=$((OFFSET - 120)) gcpubar -fg '#999' -bg '#444' -w 50 -h 7 -l "^i(${DIR}/icons/cpu.xbm) " | \ sed -u 's/#D56F6C/#ff0000/' | \ - dzen2 -xs 1 -x 1240 -w 120 -fn "${FONT}" -bg black -e 'button1=none' & + dzen2 -xs ${SCREEN} -x ${OFFSET} -w 120 -fn "${FONT}" -bg black -e 'button1=none' & -sh "${DIR}/bin/sound.sh" | dzen2 -xs 1 -x 1223 -tw 17 -w 100 -fn "${FONT}" -bg black -sa c -l 1 -e 'entertitle=uncollapse,unhide;leavetitle=collapse;button1=exec:amixer -q -c0 set Master toggle;button2=exec:pavucontrol;button3=exec:amixer -c0 -- set Master playback 80%;button4=exec:amixer -c0 -- set Master playback 2%+;button5=exec:amixer -c0 -- set Master playback 2%-' & +OFFSET=$((OFFSET - 17)) +sh "${DIR}/bin/sound.sh" | dzen2 -xs ${SCREEN} -x ${OFFSET} -tw 17 -w 100 -fn "${FONT}" -bg black -sa c -l 1 -e 'entertitle=uncollapse,unhide;leavetitle=collapse;button1=exec:amixer -q -c0 set Master toggle;button2=exec:pavucontrol;button3=exec:amixer -c0 -- set Master playback 80%;button4=exec:amixer -c0 -- set Master playback 2%+;button5=exec:amixer -c0 -- set Master playback 2%-' >/dev/null & + +# fill the rest of the screen with the information from xmonad +cat $* | dzen2 -xs ${SCREEN} -x 0 -w ${OFFSET} -ta l -fn "${FONT}" -bg black -e 'button1=none' & +MAIN=$! # kill bars on new RandR config ( ${DIR}/bin/xrandr-notify && kill ${MAIN} ) & -- cgit v1.2.3 From c570fdec56f6a4ad338fbc15dc41263e56f1b6a2 Mon Sep 17 00:00:00 2001 From: Alexander Sulfrian Date: Tue, 4 Sep 2012 16:25:02 +0200 Subject: bin/dzen2_pgrp.sh: only display battery widget, if battery is available --- bin/dzen2_pgrp.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/bin/dzen2_pgrp.sh b/bin/dzen2_pgrp.sh index 63fa325..531fe19 100644 --- a/bin/dzen2_pgrp.sh +++ b/bin/dzen2_pgrp.sh @@ -10,8 +10,11 @@ CLOCK_WIDTH=$(textwidth "$FONT" "$(date)") OFFSET=$((OFFSET - $CLOCK_WIDTH - 20)) sh "${DIR}/bin/clock.sh" | dzen2 -xs ${SCREEN} -x ${OFFSET} -w $(($CLOCK_WIDTH + 20)) -fn "${FONT}" -bg black -l 17 -p -sa c -e 'button1=exec:xscreensaver-command -lock;button3=exec:xcalendar;button2=exec:xscreensaver-command -prefs;onstart=collapse;entertitle=uncollapse,unhide;leavetitle=collapse' & -OFFSET=$((OFFSET - 120)) -sh "${DIR}/bin/bat.sh" | dzen2 -xs ${SCREEN} -x ${OFFSET} -w 120 -fn "${FONT}" -bg black -e 'button1=none' & +if [ -e "/proc/acpi/battery/BAT0" ]; then + # if battery is available, display battery widget + OFFSET=$((OFFSET - 120)) + sh "${DIR}/bin/bat.sh" | dzen2 -xs ${SCREEN} -x ${OFFSET} -w 120 -fn "${FONT}" -bg black -e 'button1=none' & +fi OFFSET=$((OFFSET - 120)) gcpubar -fg '#999' -bg '#444' -w 50 -h 7 -l "^i(${DIR}/icons/cpu.xbm) " | \ -- cgit v1.2.3 From 3283cd6e1f1e1e93192d7cb649ea16332afa0844 Mon Sep 17 00:00:00 2001 From: Alexander Sulfrian Date: Mon, 26 Nov 2012 14:05:11 +0100 Subject: clock.sh: fix highlight of multiple holidays in one line --- bin/clock.sh | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/bin/clock.sh b/bin/clock.sh index 3c67a8e..0a36087 100644 --- a/bin/clock.sh +++ b/bin/clock.sh @@ -17,9 +17,34 @@ do echo "^cs()" if hash gcal 2>/dev/null; then echo - gcal --cc-holidays=DE_BE --starting-day=Mon "${MONTH}" | sed "s/<\(\( \|[0-9]\)[0-9]\)>/ ^fg(#ff0000)\1^fg() /;s/:\(\( \|[0-9]\)[0-9]\):/ ^fg(#ffff00)\1^fg() /;/^[ \t]*$/d" + gcal --cc-holidays=DE_BE --starting-day=Mon "${MONTH}" | sed "\ + # highlight current day + s/<\(\( \|[0-9]\)[0-9]\)>/ ^fg(#ff0000)\1^fg() /; \ + + # hightlight holiday + s/:\(\( \|[0-9]\)[0-9]\):/ ^fg(#ffff00)\1^fg():/g; \ + s/:\(\( \|[0-9]\)[0-9]\):/ ^fg(#ffff00)\1^fg():/g; \ + + # remove leftover holiday marker + s/:\(\( \|[0-9]\)[0-9]\)/ \1/g; \ + + # remove empty lines + /^[ \t]*$/d" + echo " " - gcal --cc-holidays=DE_BE --starting-day=Mon "$((($MONTH % 12) +1))" "$YEAR" | sed "s/<\(\( \|[0-9]\)[0-9]\)>/ ^fg(#ff0000)\1^fg() /;s/:\(\( \|[0-9]\)[0-9]\):/ ^fg(#ffff00)\1^fg() /;/^[ \t]*$/d" + gcal --cc-holidays=DE_BE --starting-day=Mon "$((($MONTH % 12) +1))" "$YEAR" | sed "\ + # highlight current day + s/<\(\( \|[0-9]\)[0-9]\)>/ ^fg(#ff0000)\1^fg() /; \ + + # hightlight holiday + s/:\(\( \|[0-9]\)[0-9]\):/ ^fg(#ffff00)\1^fg():/g; \ + s/:\(\( \|[0-9]\)[0-9]\):/ ^fg(#ffff00)\1^fg():/g; \ + + # remove leftover holiday marker + s/:\(\( \|[0-9]\)[0-9]\)/ \1/g; \ + + # remove empty lines + /^[ \t]*$/d" else echo cal -m ${MONTH} | sed "s/$/ /;s/^\(.\{20\}\).*$/\1/" | sed -u -re "s/(^|[ ])($TODAY)($|[ ])/\1^fg(#ff0000)\2^fg()\3/" -- cgit v1.2.3