From c34b6977868880b8fc605f5464691d7596702d0a Mon Sep 17 00:00:00 2001
From: Frank Villaro-Dixon <frank@vi-di.fr>
Date: Mon, 1 Feb 2016 10:21:14 +0100
Subject: [PATCH] blah

---
 Utils/octopus.sh                        |  4 ++++
 bashrc                                  |  2 ++
 gitconfig                               |  5 ++++-
 ssh/config                              |  4 ++++
 texmf/tex/latex/frank_tex/frank_tex.sty | 15 ++++++---------
 vim/spell/en.utf-8.add                  |  1 +
 6 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/Utils/octopus.sh b/Utils/octopus.sh
index a7e0662..5561971 100755
--- a/Utils/octopus.sh
+++ b/Utils/octopus.sh
@@ -91,6 +91,10 @@ case $1 in
 				       --output $VGA --auto --rotate normal \
 				       --right-of $LVDS
 				;;
+			"CV")
+				xrandr --output $LVDS --auto --rotate normal \
+						--output $VGA --auto --rotate left --right-of $LVDS
+				;;
 			"programming")
 					xrandr --output $VGA --auto --rotate left \
 					       --output $LVDS --off
diff --git a/bashrc b/bashrc
index a7a552f..b35ea98 100644
--- a/bashrc
+++ b/bashrc
@@ -143,6 +143,7 @@ alias laptop='$OCTOPUS monitor laptop'
 alias programming='$OCTOPUS monitor programming'
 alias extern='$OCTOPUS monitor extern'
 alias clone='$OCTOPUS monitor clone'
+alias CV='$OCTOPUS monitor CV'
 
 alias volup='$OCTOPUS volume up'
 alias voldown='$OCTOPUS volume down'
@@ -152,6 +153,7 @@ alias suspend='$OCTOPUS suspend'
 
 alias mfilms='cd /dev/shm && mkdir films && sshfs frank@vi-di.fr:/media/ films/'
 alias muni='cd /dev/shm && mkdir uni && sshfs villaro0@pc69240:/user/l1/2011/villaro0/ uni/'
+alias mise990='cd /dev/shm && mkdir F_ise990 && sshfs frank@ise990:/home/frank F_ise990'
 
 alias upgrub='sudo grub-mkconfig -o /boot/grub/grub.cfg'
 
diff --git a/gitconfig b/gitconfig
index 56a623d..d56530d 100644
--- a/gitconfig
+++ b/gitconfig
@@ -30,7 +30,7 @@
 	textconv = odt2txt
 
 [push]
-	default = current 
+	default = current
 
 [sendemail]
 	smtpencryption = tls
@@ -40,3 +40,6 @@
 
 [credential]
 	helper = cache
+[http]
+	sslCAInfo = /home/frank/.git_certificates
+	sslcainfo = /home/frank/.git_certificates
diff --git a/ssh/config b/ssh/config
index 29eecaa..5f01146 100644
--- a/ssh/config
+++ b/ssh/config
@@ -54,3 +54,7 @@ host scylla
 
 host darwin.maison.local
 	ProxyCommand ssh vi-di.fr -W %h:%p
+
+host ise990
+	port 22123
+	hostname 129.194.173.214
diff --git a/texmf/tex/latex/frank_tex/frank_tex.sty b/texmf/tex/latex/frank_tex/frank_tex.sty
index 579a9ab..d0ff681 100644
--- a/texmf/tex/latex/frank_tex/frank_tex.sty
+++ b/texmf/tex/latex/frank_tex/frank_tex.sty
@@ -17,9 +17,10 @@
 
 \usepackage{microtype}
 
-\usepackage[french]{babel}
-\usepackage[french]{varioref}
+%\usepackage[french]{babel}
+%\usepackage[french]{varioref}
 
+%\bibliographystyle{alpha}
 
 \usepackage{boiboites}
 
@@ -29,20 +30,16 @@
 % Lenny, Conny ,Bjarne, Rejne, Glenn, Sonny, PetersLenny, Bjornstrup
 \usepackage[Lenny]{fncychap}
 
-%\usepackage{fancyhdr}
-
-%\usepackage{fancyhdr}
-%\pagestyle{fancyplain}
-
 
 \usepackage{eurosym}
 \usepackage{siunitx}
 %%%%\sisetup{group-separator = {`}}
 \DeclareSIUnit{\EUR}{\text{\euro}}
+\DeclareSIUnit{\yr}{yr}
 \DeclareSIUnit{\month}{mo}
 \sisetup{
-%	per-mode = fraction,
-	inter-unit-product = \ensuremath{{}\cdot{}},
+	per-mode = fraction,
+%	inter-unit-product = \ensuremath{{}\cdot{}},
 }
 
 \usepackage{indentfirst}
diff --git a/vim/spell/en.utf-8.add b/vim/spell/en.utf-8.add
index 580763d..93e0beb 100644
--- a/vim/spell/en.utf-8.add
+++ b/vim/spell/en.utf-8.add
@@ -77,3 +77,4 @@ d'irradiance
 relayage
 renewability
 malloc'ed
+interdisciplinarity