From f325856737593a4f97871bace6a456d8299f6e18 Mon Sep 17 00:00:00 2001 From: Alexander Sulfrian Date: Fri, 10 Jul 2015 01:52:16 +0200 Subject: dzen2_pgrp: Use $DZEN to execute dzen2 --- bin/dzen2_pgrp.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/bin/dzen2_pgrp.sh b/bin/dzen2_pgrp.sh index dd9e628..3a74831 100644 --- a/bin/dzen2_pgrp.sh +++ b/bin/dzen2_pgrp.sh @@ -2,34 +2,35 @@ DIR="${HOME}/.dzen2/" FONT="-*-terminus-medium-r-normal-*-12-*-*-*-*-*-*-*" SCREEN=1 +DZEN2="$HOME/dev/dzen/dzen2" # get width of screen OFFSET=$(${DIR}/bin/xinerama-resolution ${SCREEN} | cut -dx -f1) CLOCK_WIDTH=$(textwidth "$FONT" "$(LC_ALL=C 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/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' & 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' & + 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) " | \ sed -u 's/#D56F6C/#ff0000/' | \ - dzen2 -xs ${SCREEN} -x ${OFFSET} -w 120 -fn "${FONT}" -bg black -e 'button1=none' & + $DZEN2 -xs ${SCREEN} -x ${OFFSET} -w 120 -fn "${FONT}" -bg black -e 'button1=none' & OFFSET=$((OFFSET - 17)) ${DIR}/bin/pulse-dbus-receive.py | \ - /home/alex/dev/dzen/dzen2 -xs ${SCREEN} -x ${OFFSET} -tw 17 -w 100 -fn "${FONT}" -bg black -sa c -l 1 \ + $DZEN2 -xs ${SCREEN} -x ${OFFSET} -tw 17 -w 100 -fn "${FONT}" -bg black -sa c -l 1 \ -e 'entertitle=uncollapse,unhide;leavetitle=collapse;button2=exec:pavucontrol\ ;button1=exec:amixer -q sset Master toggle;button3=exec:amixer -q sset Master 80%\ ;button4=exec:amixer -q sset Master 2%+;button5=exec:amixer -q sset Master 2%-' & # 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' & +cat $* | $DZEN2 -xs ${SCREEN} -x 0 -w ${OFFSET} -ta l -fn "${FONT}" -bg black -e 'button1=none' & MAIN=$! # kill bars on new RandR config -- cgit v1.2.3