From f30e0790b556df0d080430484de4adde29e9be6a Mon Sep 17 00:00:00 2001
From: Frank Villaro-Dixon <frank@vi-di.fr>
Date: Mon, 30 Jun 2014 19:57:19 +0200
Subject: [PATCH] procmail

---
 Utils/octopus.sh | 42 +++++++++++++++++++++---------------------
 procmailrc       |  5 +++++
 vim/vimrc        |  2 +-
 3 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/Utils/octopus.sh b/Utils/octopus.sh
index 1bc4176..82012c8 100755
--- a/Utils/octopus.sh
+++ b/Utils/octopus.sh
@@ -62,30 +62,30 @@ case $1 in
 	"monitor")
 		case $2 in
 			"extern")
-				xrandr --output LVDS2 --off \
-				       --output VGA2 --auto --rotate normal
+				xrandr --output LVDS1 --off \
+				       --output VGA1 --auto --rotate normal
 				;;
 			"laptop")
-				xrandr --output LVDS2 --auto --rotate normal \
-				       --output VGA2 --off
+				xrandr --output LVDS1 --auto --rotate normal \
+				       --output VGA1 --off
 				;;
 			"dual")
-				xrandr --output LVDS2 --auto --rotate normal \
-				       --output VGA2 --auto --rotate normal \
-				       --right-of LVDS2
+				xrandr --output LVDS1 --auto --rotate normal \
+				       --output VGA1 --auto --rotate normal \
+				       --right-of LVDS1
 				;;
 			"programming")
-					xrandr --output VGA2 --auto --rotate left \
-					       --output LVDS2 --off
+					xrandr --output VGA1 --auto --rotate left \
+					       --output LVDS1 --off
 					;;
 			"pdfpc")
-				xrandr --output LVDS2 --auto --rotate normal \
-				       --output VGA2 --auto --rotate normal \
-				       --left-of LVDS2
+				xrandr --output LVDS1 --auto --rotate normal \
+				       --output VGA1 --auto --rotate normal \
+				       --left-of LVDS1
 				;;
 			"clone")
-				xrandr --output LVDS2 --auto \
-				       --output VGA2 --auto --same-as LVDS2
+				xrandr --output LVDS1 --auto \
+				       --output VGA1 --auto --same-as LVDS1
 				;;
 			"off")
 				xset dpms force off
@@ -99,7 +99,7 @@ case $1 in
 		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=`/usr/bin/amixer get Master | grep "%" | cut -d' ' -f6`
+		VOLUME=`/usr/bin/amixer get Master | grep "%" | cut -d' ' -f7 | head -n1`
 ##		VOLUME=`amixer get Master | grep '\[' | cut -d' ' -f6`
 		SONG=`mpc | head -n 1 | cut -d. -f1`
 
@@ -136,12 +136,12 @@ case $1 in
 		;;
 
 	"init-all")
-		xrandr | grep "VGA2 disconnected" > /dev/null
-		if [ $? -eq 0 ]; then
-			$0 monitor laptop
-		else
-			$0 monitor extern
-		fi
+#		xrandr | grep "VGA2 disconnected" > /dev/null
+#		if [ $? -eq 0 ]; then
+#			$0 monitor laptop
+#		else
+#			$0 monitor extern
+#		fi
 
 		sudo killall dhcpcd
 		$0 init-wifi &
diff --git a/procmailrc b/procmailrc
index 09a79a8..5d1f52a 100644
--- a/procmailrc
+++ b/procmailrc
@@ -19,6 +19,11 @@ SED=/bin/sed
 	* ^From:.*EachBuyer.*
 	$SPAMBOX
 
+#TVShow time: I dont fucking care
+:0
+	* ^From:.*weekly@tvshowtime.com.*
+	$SPAMBOX
+
 #Acycles: spam de merde
 :0
 	* ^To:.*acycles@vi-di.fr.*
diff --git a/vim/vimrc b/vim/vimrc
index 392471f..388e5e5 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -166,7 +166,7 @@ autocmd BufRead,BufNewFile *.latex set tw=80 fo+=aw
 autocmd BufRead,BufNewFile *.lista set filetype=lisp
 autocmd BufRead,BufNewFile *.xml set ts=4 sw=4
 
-autocmd BufRead,BufNewFile *.m set nospell
+"autocmd BufRead,BufNewFile *.m set nospell
 
 
 "Automatic documentation