diff --git a/Utils/octopus.sh b/Utils/octopus.sh index fceb046..3d8d5a6 100755 --- a/Utils/octopus.sh +++ b/Utils/octopus.sh @@ -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" ;; diff --git a/bashrc b/bashrc index 2443a3c..e7d124f 100644 --- a/bashrc +++ b/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' diff --git a/xinitrc b/xinitrc index 17072f6..f5cbb49 100644 --- a/xinitrc +++ b/xinitrc @@ -24,7 +24,7 @@ wmname LG3D while true; do $OCTOPUS refresh - sleep 2 + sleep 10 done & exec /home/frank/Programmation/dotfiles/dwm/dwm