From 32cebf7f557909feffd4b617a8147ff2b695bd5f Mon Sep 17 00:00:00 2001
From: Frank Villaro-Dixon <frank@vi-di.fr>
Date: Wed, 21 Aug 2013 18:22:38 +0200
Subject: [PATCH] nothing..

---
 bashrc      |  2 ++
 mailcap     |  1 +
 mutt/muttrc | 40 ++++++++++++++++------------------------
 ssh/config  |  5 +++++
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/bashrc b/bashrc
index b697519..7f4fdfd 100644
--- a/bashrc
+++ b/bashrc
@@ -118,6 +118,8 @@ alias ssh='ssh-add -l >/dev/null || ssh-add ~/.ssh/id_rsa.auth && unalias ssh; s
 alias upkey='gpg --keyserver subkeys.pgp.net --send-key 6F36914A'
 alias shm='cd /dev/shm'
 
+alias ip6='ip -6'
+
 #MONITOR_PATH=~/Programmation/Utils/monitor.sh
 #alias dual='$MONITOR_PATH dual'
 #alias laptop='$MONITOR_PATH laptop'
diff --git a/mailcap b/mailcap
index dd5651d..f516fb0 100644
--- a/mailcap
+++ b/mailcap
@@ -1,3 +1,4 @@
 image/*; eog %s
 text/html; lynx -display_charset=utf-8 -dump %s; nametemplate=%s.html; copiousoutput
 audio/*; vlc %s
+application/pdf; evince %s
diff --git a/mutt/muttrc b/mutt/muttrc
index 873ee88..7180f14 100644
--- a/mutt/muttrc
+++ b/mutt/muttrc
@@ -1,5 +1,3 @@
-
-
 ############################
 ##### ATTENTION - /!\ ######
 # Fichier sur git,         #
@@ -9,13 +7,22 @@
 ############################
 
 
-set imap_user = "frank_mail"
-
-# Keep IMAP connection alive by polling intermittently (time in seconds).
-set imap_keepalive = 300
-set smtp_url = "smtp://frank_mail@villaro-dixon.eu:587/"
 set from = "Frank@Villaro-Dixon.eu"
 set realname = "Frank Villaro-Dixon"
+set smtp_url = "smtp://frank_mail@villaro-dixon.eu:587/"
+
+set imap_user = "frank_mail"
+set folder = "imaps://villaro-dixon.eu:993"
+# Keep IMAP connection alive by polling intermittently (time in seconds).
+set imap_keepalive = 300
+set spoolfile = "+INBOX"
+mailboxes =INBOX =UNIGE =SPAM =BITFLIP
+#Bien ajouter le "+" devant !!!
+set postponed = "+Drafts"
+# Where to save sent messages ?
+set record = "+Sent"
+
+
 
 ##Passwords:
 ####source "gpg -d ~/.mutt/passwords.gpg |"
@@ -25,17 +32,6 @@ source "~/.mutt/unlock-pass.sh |"
 #set editor = "vim"
 set editor="$HOME/.mutt/killsig %s; /usr/bin/vim %s"
 
-# Basic config, you can leave this as is
-set folder = "imaps://villaro-dixon.eu:993"
-set spoolfile = "+INBOX"
-mailboxes =INBOX =UNIGE =SPAM =BITFLIP
-
-#Bien ajouter le "+" devant !!!
-set postponed = "+Drafts"
-# Where to save sent messages ?
-
-set record = "+Sent"
-
 set imap_check_subscribed
 
 # Allow Mutt to open new imap connection automatically.
@@ -44,6 +40,7 @@ set hostname = villaro-dixon.eu
 #how often to check
 set mail_check = 120
 bind index "^" imap-fetch-mail
+unset mark_old #Do not mark new messages as old after closing mutt
 set beep_new
 
 set timeout = 300
@@ -55,6 +52,7 @@ set include
 set sort = 'threads'
 set sort_aux = 'reverse-last-date-received'
 set auto_tag = yes
+set abort_unmodified=ask-yes #réponse non modifiée
 
 ignore "Authentication-Results:"
 ignore "DomainKey-Signature:"
@@ -83,18 +81,12 @@ source ~/.mutt/crypto
 
 
 # LISTE DE CONTACTS
-
 #Alias
 set alias_file=~/.mutt/alias
 set sort_alias = alias
 set reverse_alias = yes
 source $alias_file
 
-#ou abook XOR
-#set query_command= "abook --mutt-query '%s'"
-#macro index,pager  a "<pipe-message>abook --add-email-quiet<return>" "Add this sender to Abook"
-#bind editor        <Tab> complete-query
-
 set date_format="%d-%m-%y %T"
 set index_format="%2C | %Z [%d] %-30.30F (%-4.4c) %s"
 
diff --git a/ssh/config b/ssh/config
index 3f401df..3d31def 100644
--- a/ssh/config
+++ b/ssh/config
@@ -30,3 +30,8 @@ host intersect
 host chuck
 	port 1337
 
+host pc69240
+	hostname 2001:620:600:4400:214:4fff:fea8:6d3c
+
+host cuilxa
+	hostname cuilxa.unige.ch