From 49fd83cca2b5ebc5b1b93fc15b94fc932be138d6 Mon Sep 17 00:00:00 2001
From: Frank Villaro-Dixon <frank@vi-di.fr>
Date: Mon, 13 Jun 2016 11:00:37 +0200
Subject: [PATCH] various shit

---
 Utils/octopus.sh       |  2 +-
 bashrc                 |  1 +
 mailcap                |  3 ++-
 ssh/config             | 13 +++++++------
 vim/spell/en.utf-8.add |  4 ++++
 vim/vimrc              |  2 +-
 6 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/Utils/octopus.sh b/Utils/octopus.sh
index 5561971..7d0ad06 100755
--- a/Utils/octopus.sh
+++ b/Utils/octopus.sh
@@ -89,7 +89,7 @@ case $1 in
 			"dual")
 				xrandr --output $LVDS --auto --rotate normal \
 				       --output $VGA --auto --rotate normal \
-				       --right-of $LVDS
+				       --left-of $LVDS
 				;;
 			"CV")
 				xrandr --output $LVDS --auto --rotate normal \
diff --git a/bashrc b/bashrc
index 32a658b..9661786 100644
--- a/bashrc
+++ b/bashrc
@@ -618,6 +618,7 @@ export PATH=$PATH:~/Programmation/dotfiles/Utils
 
 export HISTCONTROL=erasedups
 export HISTSIZE=99999999
+HISTTIMEFORMAT="%d/%m/%y %T "
 # }}}
 export PATH="$HOME/opt/cross/bin:$PATH"
 export PATH="$HOME/.gem/ruby/2.2.0/bin:$PATH"
diff --git a/mailcap b/mailcap
index 1e5f11b..e4124ce 100644
--- a/mailcap
+++ b/mailcap
@@ -1,6 +1,7 @@
 image/*; eog %s
 #text/html; lynx -display_charset=utf-8 -dump %s; nametemplate=%s.html; copiousoutput
-text/html; firefox %s
+text/html; lynx -dump -localhost -force_html -width 80 %s; copiousoutput
+#text/html; firefox %s
 audio/*; vlc %s
 application/pdf; evince %s
 application/msword; libreoffice %s
diff --git a/ssh/config b/ssh/config
index 10eb4c9..563f517 100644
--- a/ssh/config
+++ b/ssh/config
@@ -7,7 +7,7 @@ IdentityFile ~/.ssh/id_dsa
 #    KexAlgorithms curve25519-sha256@libssh.org,diffie-hellman-group-exchange-sha256
 
 ###Compression yes
-
+#
 host vi-di.fr
 	hostname 178.250.210.95
 	port 1337
@@ -19,10 +19,6 @@ host git.vi-di.fr
 	user git
 	port 1337
 
-host aeipi
-	hostname 129.194.70.30
-	user root
-
 host bor-git
 	hostname 94.23.42.46
 	user git
@@ -61,6 +57,11 @@ host scylla
 host darwin.maison.local
 	ProxyCommand ssh vi-di.fr -W %h:%p
 
-host ise990
+host lilakes
 	port 22123
 	hostname 129.194.173.214
+
+host erivers
+	port 22123
+#2001:620:600:ac00:1a03:73ff:fe23:fc23/
+	hostname 129.194.173.249
diff --git a/vim/spell/en.utf-8.add b/vim/spell/en.utf-8.add
index 7519628..2fef691 100644
--- a/vim/spell/en.utf-8.add
+++ b/vim/spell/en.utf-8.add
@@ -83,3 +83,7 @@ dont/!
 Un/!
 MWh
 spirulina
+renouvable/!
+vous/!
+dict
+vous
diff --git a/vim/vimrc b/vim/vimrc
index c2852af..6e579f6 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -177,7 +177,7 @@ autocmd BufRead,BufNewFile *.md set filetype=markdown tw=80 fo+=aw
 
 
 "Automatic documentation
-autocmd BufNewFile,BufRead *.py set keywordprg=pydoc
+autocmd BufNewFile,BufRead *.py set keywordprg=pydoc ts=4 sw=4 noexpandtab
 autocmd BufNewFile,BufRead *.php set ts=4 sw=4 keywordprg=~/.vim/scripts/doc.php.sh
 autocmd BufNewFile,BufRead *.R set ts=4 sw=4 keywordprg=~/.vim/scripts/doc.R.sh
 autocmd BufNewFile,BufRead *.m set ts=4 sw=4 keywordprg=~/.vim/scripts/doc.octave.sh