From 150eab0b4ccdaabb847b16653a6f8b0c6ac1decd Mon Sep 17 00:00:00 2001
From: Frank Villaro-Dixon <frank@vi-di.fr>
Date: Tue, 2 Jul 2013 00:47:58 +0200
Subject: [PATCH 1/2] Am I stupid?

---
 Utils/octopus.sh | 2 +-
 bashrc           | 2 +-
 xinitrc          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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 93b88e0..910aaa8 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 ]] && 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

From 8dcb8923435f7dd2ae3cc41ee4c0d9f76e3bbe95 Mon Sep 17 00:00:00 2001
From: Frank Villaro-Dixon <frank@vi-di.fr>
Date: Tue, 2 Jul 2013 00:51:58 +0200
Subject: [PATCH 2/2] startx by default but not on ssh

---
 bashrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bashrc b/bashrc
index 910aaa8..c5e7386 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'