Merge branch 'master' of vi-di.fr:dotfiles

This commit is contained in:
Frank Villaro-Dixon 2013-06-28 20:33:31 +02:00
commit 21890b5152
3 changed files with 6 additions and 4 deletions

View file

@ -50,11 +50,13 @@ case $1 in
"refresh") "refresh")
DATE=`date +"%A %d, %H:%M:%S - %s"` DATE=`date +"%A %d, %H:%M:%S - %s"`
BATT=$( acpi -b | sed 's/.*[charg.|], \([0-9]*\)%.*/\1/gi' ) BATT_PCT=$(acpi -b | cut -d, -f2 | cut -d" " -f2)
BATT_TIME=$(acpi -b | cut -d, -f3 | cut -d" " -f2)
#BATT=$( acpi -b | sed 's/.*[charg.|], \([0-9]*\)%.*/\1/gi' )
VOLUME=`amixer get Master | tail -n 2 | head -n 1 | cut -d' ' -f7` VOLUME=`amixer get Master | tail -n 2 | head -n 1 | cut -d' ' -f7`
MEM=`awk '/MemTotal/ {printf( "%.0fMb", $2 / 1024 )}' /proc/meminfo` MEM=`awk '/MemTotal/ {printf( "%.0fMb", $2 / 1024 )}' /proc/meminfo`
xsetroot -name "$VOLUME :: $MEM :: $BATT :: $DATE" xsetroot -name "$VOLUME :: $MEM :: $BATT_PCT $BATT_TIME :: $DATE"
;; ;;
"wallpaper") "wallpaper")

View file

@ -53,7 +53,7 @@ static const Layout layouts[] = {
/* commands */ /* commands */
static const char *dmenucmd[] = { "dmenu_run", "-fn", font, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, NULL }; static const char *dmenucmd[] = { "dmenu_run", "-fn", font, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, NULL };
static const char *termcmd[] = { "gnome-terminal", NULL }; static const char *termcmd[] = { "roxterm", NULL };
static const char *webcmd[] = { "firefox", NULL }; static const char *webcmd[] = { "firefox", NULL };
static const char *mailcmd[] = { "thunderbird", NULL }; static const char *mailcmd[] = { "thunderbird", NULL };

View file

@ -34,7 +34,7 @@ cd skeletons
for i in `ls $WAI/vim/skeletons`; do ln -s $WAI/vim/skeletons/$i ./$i; done for i in `ls $WAI/vim/skeletons`; do ln -s $WAI/vim/skeletons/$i ./$i; done
cd ~ cd ~
if [ -d "Programmation"]; then mkdir Programmation; fi; if [ -d "Programmation" ]; then mkdir Programmation; fi;
cd ~/Programmation cd ~/Programmation
if [ ! -d "./Utils" ]; then mkdir Utils; fi; if [ ! -d "./Utils" ]; then mkdir Utils; fi;
cd ./Utils cd ./Utils