Merge branch 'master' of vi-di.fr:dotfiles
This commit is contained in:
commit
4802b9d023
|
@ -54,7 +54,7 @@ case $1 in
|
|||
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`
|
||||
MEM=`awk '/MemTotal/ {printf( "%.0fMb", $2 / 1024 )}' /proc/meminfo`
|
||||
MEM=`awk '/MemFree/ {printf( "%.0fMb", $2 / 1024 )}' /proc/meminfo`
|
||||
|
||||
xsetroot -name "$VOLUME :: $MEM :: $BATT_PCT $BATT_TIME :: $DATE"
|
||||
;;
|
||||
|
|
2
bashrc
2
bashrc
|
@ -2,7 +2,7 @@
|
|||
shopt -s checkwinsize
|
||||
|
||||
#Launch startx when login
|
||||
[[ -z $DISPLAY && $XDG_VTNR -le 4 ]] && exec startx
|
||||
[[ -z $DISPLAY && $XDG_VTNR -le 4 && -z $SSH_CLIENT ]] && exec startx
|
||||
|
||||
shopt -s histappend
|
||||
PROMPT_COMMAND='history -a'
|
||||
|
|
Loading…
Reference in a new issue