Merge branch 'master' of ssh://master/home/manu/public_git/kolter-dotfiles

.inputrc

@@ -0,0 +1,12 @@
+#
+# Readline configuration file (~/.inputrc)
+# 2012, kolter <kolter@openics.org>
+#
+#  This file is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY
+#
+
+set show-all-if-ambiguous on
+set completion-ignore-case on
+set completion-map-case on
+

.mailfilter

@@ -28,7 +28,7 @@ if (/^X-BeenThere:\s*(.*)@rmll\.info/)
         to $MAILDIR/.rmll.09.$MATCH1
     }
 }
-if (/^From:.*reservation@rmll\.info/ || /^From:.*tpeweb@paybox\.com/)
+if (/^From:.*reservation@rmll\.info/ || /^From:.*tpeweb@paybox\.com/ || /^From:.*noreply@ogone\.com/)
 {
     to $MAILDIR/.rmll.resa
 }
@@ -106,7 +106,7 @@ if (/^List-Id:.*<(.*)\.lists\.parinux\.org>/)
 }
 
 ### FrNog
-if (/^List-Id: .*frnog=FRnOG\.org/)
+if (/^List-Id: .*frnog=FRnOG\.org/ || /^List-Id:.*<frnog\.frnog\.org>/)
 {
     to $MAILDIR/.groups.frnog
 }
@@ -166,7 +166,7 @@ if (/^List-Id:.*<(.*)\.listes\.sud-ouest\.org>/)
 }
 
 ### SYMPA Lists
-if (/^List-Id:.*<sympa-(.*)\.cru\.fr>/)
+if (/^List-Id:.*<sympa-(.*)\.listes\.renater\.fr>/)
 {
     exception {
         `test -d $MAILDIR/.sympa.$MATCH1`

.mutt/conf/mailboxes

@@ -54,13 +54,14 @@ mailboxes +.rmll.comite
 mailboxes +.rmll.discussion
 mailboxes +.rmll.admins
 mailboxes +.rmll.resa
-mailboxes +.rmll.11
-mailboxes +.rmll.11.org
-mailboxes +.rmll.11.themes
-mailboxes +.rmll.11.notif
-mailboxes +.rmll.11.audiovideo
-mailboxes +.rmll.11.village
-mailboxes +.rmll.11.participants
+
+mailboxes +.rmll.12
+mailboxes +.rmll.12.org
+mailboxes +.rmll.12.themes
+mailboxes +.rmll.12.notif
+mailboxes +.rmll.12.audiovideo
+mailboxes +.rmll.12.village
+mailboxes +.rmll.12.participants
 
 mailboxes +.debian-france
 mailboxes +.debian-france.ag
@@ -107,9 +108,6 @@ mailboxes +.sympa.packagers
 mailboxes +.sympa.users
 mailboxes +.sympa.fr
 
-mailboxes +.kde
-mailboxes +.kde.kwrite-devel
-
 mailboxes +.groups
 mailboxes +.groups.asyd_sysadmin
 mailboxes +.groups.asyd_emacs
@@ -135,9 +133,13 @@ mailboxes +.debian.pkg.pwman3
 mailboxes +.debian.pkg.weechat
 mailboxes +.debian.pkg.wkhtmltopdf
 
-mailboxes +.rmll
-mailboxes +.rmll.09
-mailboxes +.rmll.09.org
+mailboxes +.rmll.11
+mailboxes +.rmll.11.org
+mailboxes +.rmll.11.themes
+mailboxes +.rmll.11.notif
+mailboxes +.rmll.11.audiovideo
+mailboxes +.rmll.11.village
+mailboxes +.rmll.11.participants
 mailboxes +.rmll.10
 mailboxes +.rmll.10.org
 mailboxes +.rmll.10.programme
@@ -153,3 +155,6 @@ mailboxes +.rmll.10.village
 mailboxes +.rmll.10.participants
 mailboxes +.rmll.10.benevoles
 mailboxes +.rmll.10.rmll-uesi
+mailboxes +.rmll
+mailboxes +.rmll.09
+mailboxes +.rmll.09.org

.mutt/muttrc

@@ -12,7 +12,7 @@
 set realname        = "Emmanuel Bouthenot"
 set from            = "kolter@openics.org"
 set signature       = "~/.signatures/main"
-alternates          "(kolter|emmanuel\.bouthenot|manu)@(openics\.org|debian\.org|free\.fr|bouthenot\.name)"
+alternates          "(kolter|emmanuel\.bouthenot|manu|emmanuel)@(openics\.org|debian\.org|free\.fr|bouthenot\.name)"
 
 set envelope_from   = yes                       # set return-path to from instead of user@hostname
 set hostname        = openics.org

.tigrc

@@ -0,0 +1,19 @@
+#
+# Base configuration
+#
+# Syntax: set <option> = <value>
+
+set show-rev-graph = yes        # Show revision graph?
+set line-number-interval = 5    # Interval between line numbers
+set tab-size = 8                # Number of spaces pr tab
+
+#
+# Key configuration
+#
+# Syntax: bind <keymap> <key> <request>
+
+bind generic E !git format-patch -1 %(commit)
+bind generic r !git revert %(commit)
+bind generic T !tig-tag %(commit)
+
+# vim: ft=muttrc

.zsh.d/zshrc

@@ -47,11 +47,14 @@ for f in $DOTZSHDIR/config.d/*.zsh ; do
 done
 
 # sourcing externals plugins
-for d in $DOTZSHDIR/externals.d/*; do
-    if [ -f "$d/${d##*/}.zsh" ]; then
-        source "$d/${d##*/}.zsh"
-    fi
-done
+# some features are not well supported by zsh <= 4.3.6
+if [ "$(printf "%02d%02d%02d" $(echo ${ZSH_VERSION:gs/./ /}))" -gt "040306" ]; then
+    for d in $DOTZSHDIR/externals.d/*; do
+        if [ -f "$d/${d##*/}.zsh" ]; then
+            source "$d/${d##*/}.zsh"
+        fi
+    done
+fi
 
 # using 'sudo zsh'
 if [ "$SUDO_USER" -a "$UID" = 0 ]; then