various things

Utils/octopus.sh

@@ -63,6 +63,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`
+##		VOLUME=`amixer get Master | grep '\[' | cut -d' ' -f6`
 
 		MEMFREE=`awk '/MemFree/ {printf( "%.0f", $2 / 1024 )}' /proc/meminfo`
 		MEMCACHED=`awk '/Cached/ {printf( "%.0f", $2 / 10240 )}' /proc/meminfo`

mutt/muttrc

@@ -93,7 +93,7 @@ auto_view text/html
 bind editor ^T complete
 bind editor <space> noop 
 
-set pager_stop="yes"
+set pager_stop
 
 # Gmail-style keyboard shortcuts
 #macro index,pager y "<enter-command>unset trash\n <delete-message>" "Gmail archive message"

vim/vimrc

@@ -21,7 +21,7 @@ set number
 set ts=8 "Un tab, huit espaces
 set noexpandtab "On veut pas remplacer tab -> espace
 set wrap "Une grande ligne continue à la ligne
-set mouse=a
+"set mouse=a
 
 set hlsearch "On souligne les mots cherchés
 set incsearch "recherche peu à peu
@@ -154,3 +154,8 @@ if bufwinnr(1)
 	map + <C-W>>
 	map - <C-W><
 endif
+
+
+"vimdiff
+set diffopt+=iwhite
+