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

.gitconfig

@@ -25,9 +25,11 @@
 	changed = bold red
 	untracked = bold yellow
 
+[merge]
+	tool = vimdiff
+
 # git.debian.org specifics
 [url "git://anonscm.debian.org"]
 	insteadOf = "git://git.debian.org"
 [url "ssh://git.debian.org"]
 	pushInsteadOf = "git://git.debian.org"
-

.mailfilter

@@ -128,8 +128,8 @@ if (/^List-Id:.*<(.*)\.asyd\.net>/)
     to $MAILDIR/.groups.asyd_$MATCH1
 }
 
-### Abul Lists
-if (/^List-Id:.*<(.*)\.abul\.org>/)
+### ABUL Lists
+if (/^List-Id:.*<(.*)\.listes\.abul\.org>/ || /^List-Id:.*<([^\.]*)\.abul\.org>/)
 {
     exception {
         `test -d $MAILDIR/.abul.$MATCH1`
@@ -139,6 +139,21 @@ if (/^List-Id:.*<(.*)\.abul\.org>/)
     }
 }
 
+### Linux-Nantes Lists
+if (/^List-Id:.*<(.*)\.linux-nantes\.org>/)
+{
+    exception {
+        `test -d $MAILDIR/.linux-nantes.$MATCH1`
+        if( $RETURNCODE == 1 )
+            `$MAILDIRMAKE $MAILDIR/.linux-nantes.$MATCH1`
+        to $MAILDIR/.linux-nantes.$MATCH1
+    }
+}
+if (/^List-Id:.*<linux-nantes\.univ-nantes.fr>/)
+{
+    to $MAILDIR/.linux-nantes.linux-nantes
+}
+
 ### Sud-Ouest.org Lists
 if (/^List-Id:.*<(.*)\.listes\.sud-ouest\.org>/)
 {
@@ -162,13 +177,13 @@ if (/^List-Id:.*<sympa-(.*)\.cru\.fr>/)
 }
 
 ### Aquilenet Lists
-if (/^List-Id:.*<(.*)\.aquilenet\.fr>/)
+if (/^List-Id:.*<(.*)\.listes\.aquilenet\.fr>/)
 {
     exception {
         `test -d $MAILDIR/.aquilenet.$MATCH1`
         if( $RETURNCODE == 1 )
             `$MAILDIRMAKE $MAILDIR/.aquilenet.$MATCH1`
-        to $MAILDIR/.fdn.$MATCH1
+        to $MAILDIR/.aquilenet.$MATCH1
     }
 }
 

.mutt/conf/colors

@@ -9,66 +9,123 @@
 # Colors settings for Mutt.
 #
 
-# Default colour definitions
-color normal     default      default
-color message    brightwhite  default
-color status     brightblue   default
-color hdrdefault yellow       default
-color indicator	 brightwhite  cyan
-
-
-color quoted   cyan      default
-color quoted1  yellow    default
-color quoted2  brightred default
-color quoted3  cyan      default
-color quoted4  yellow    default
-color quoted5  brightred default
-color quoted6  cyan      default
-color quoted7  yellow    default
-color quoted8  brightred default
-
-
-color signature  white       default
-color tilde      white       default
-color tree       brightblue  default
-color attachment brightgreen default
-# color error      red          white
-# color search     brightwhite  magenta
-
-# color bold       brightyellow white
-# color markers    red          white
-
-# Colours for items in the reader
-color header cyan         default "^From\:|^To\:|^Cc\:|^Bcc\:"
-color header green        default "^Return-Path\:"
-color header blue         default "^Reply-To\:"
-color header brightred    default "\Subject\:|^Date\:"
-
-# Colours for items in the index
-color index yellow  default ~N   # New messages.
-color index green   default ~O   # Old messages.
-color index red     default ~D   # Deletes messages.
-color index magenta default ~T   # Tagged messages.
-color index blue    default ~F   # Flagged messages.
-
-# Highlights inside the body of a message.
-
-# URLs
-color body green default "(http|https|ftp|news|telnet|finger)://[^ \">\t\r\n]*"
-color body green default "mailto:[-a-z_0-9.]+@[-a-z_0-9.]+"
-color body green default "news:[^ \">\t\r\n]*"
-
-# email addresses
-color body green default "[-a-z_0-9.%$]+@[-a-z_0-9.]+\\.[-a-z][-a-z]+"
-
-# Various smilies
-color body brightred default "<[Gg]>"                                            # <g>
-color body brightred default "<[Bb][Gg]>"                                        # <bg>
-color body brightred default " [;:]-*[)>(<|]"                                    # :-) etc...
-color body brightred default "(^|[[:space:]])\\*[^[:space:]]+\\*([[:space:]]|$)" # *Bold* text.
-color body brightred default "(^|[[:space:]])_[^[:space:]]+_([[:space:]]|$)"     # _Underlined_ text.
-color body brightred default "(^|[[:space:]])/[^[:space:]]+/([[:space:]]|$)"     # /Italic/ text.
-
-# Sidebar color
-color sidebar_new yellow default
+# messages which mention my name in the body
+#color index         color136        default        "~b \"phil(_g|\!| gregory| gold)|pgregory\" !~N !~T !~F !~p !~P"
+#color index         J_cream         color230        "~b \"phil(_g|\!| gregory| gold)|pgregory\" ~N !~T !~F !~p !~P"
+#color index         color136        color37         "~b \"phil(_g|\!| gregory| gold)|pgregory\" ~T !~F !~p !~P"
+#color index         color136        J_magent        "~b \"phil(_g|\!| gregory| gold)|pgregory\" ~F !~p !~P"
+
+# messages which are in reference to my mails
+#color index         J_magent        default        "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" !~N !~T !~F !~p !~P"
+#color index         J_magent        color230        "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" ~N !~T !~F !~p !~P"
+#color index         J_magent        color37         "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" ~T !~F !~p !~P"
+#color index         J_magent        color160        "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" ~F !~p !~P"
+
+# for background in 16 color terminal, valid background colors include:
+# base03, bg, black, any of the non brights
+
+# basic colors ---------------------------------------------------------
+color error         color8          default
+color tilde         color235        default
+color message       color213        default
+color markers       color160        color254
+color attachment    color108        default
+color search        color22         color43
+color status        color241        color235
+color indicator     color151        color241
+color tree          color142        default                                    # arrow in threads
+
+# index ----------------------------------------------------------------
+
+#color index         color160        default        "~D(!~p|~p)"               # deleted
+#color index         color235        default        ~F                         # flagged
+#color index         color166        default        ~=                         # duplicate messages
+#color index         color240        default        "~A!~N!~T!~p!~Q!~F!~D!~P"  # the rest
+#color index         J_base          default        "~A~N!~T!~p!~Q!~F!~D"      # the rest, new
+
+color index         color226        default        "~A"                        # all messages
+#color index         color166        default        "~E"                        # expired messages
+color index         color117        default        "~N"                        # new messages
+color index         color117        default        "~O"                        # old messages
+
+color index         color251        default        "~R"                        # read messages
+color index         color77         default        "~Q"                        # messages that have been replied to
+
+#color index         color33         default        "~U"                        # unread messages
+#color index         color33         default        "~U~$"                      # unread, unreferenced messages
+#color index         color241        default        "~v"                        # messages part of a collapsed thread
+#color index         color241        default        "~P"                        # messages from me
+#color index         color37         default        "~p!~F"                     # messages to me
+#color index         color37         default        "~N~p!~F"                   # new messages to me
+#color index         color37         default        "~U~p!~F"                   # unread messages to me
+#color index         color249        default        "~R~p!~F"                   # messages to me
+color index         color166        default        "~F"                        # flagged messages
+#color index         color160        default        "~F~p"                      # flagged messages to me
+#color index         color160        default        "~N~F"                      # new flagged messages
+#color index         color160        default        "~N~F~p"                    # new flagged messages to me
+#color index         color160        default        "~U~F~p"                    # new flagged messages to me
+color index         color250        color160        "~D"                        # deleted messages
+#color index         color245        default        "~v~(!~N)"                  # collapsed thread with no unread
+#color index         color136        default        "~v~(~N)"                   # collapsed thread with some unread
+#color index         color64         default        "~N~v~(~N)"                 # collapsed thread with unread parent
+
+# statusbg used to indicated flagged when foreground color shows other status
+# for collapsed thread
+
+#color index         color160        color235        "~v~(~F)!~N"                # collapsed thread with flagged, no unread
+#color index         color136        color235        "~v~(~F~N)"                 # collapsed thread with some unread & flagged
+#color index         color64         color235        "~N~v~(~F~N)"               # collapsed thread with unread parent & flagged
+#color index         color64         color235        "~N~v~(~F)"                 # collapsed thread with unread parent, no unread inside, but some flagged
+#color index         color37         color235        "~v~(~p)"                   # collapsed thread with unread parent, no unread inside, some to me directly
+#color index         color136        color160        "~v~(~D)"                   # thread with deleted (doesn't differentiate between all or partial)
+
+#color index         color136        default        "~(~N)"                    # messages in threads with some unread
+#color index         color64         default        "~S"                       # superseded messages
+color index         color168        default         "~T"                       # tagged messages
+#color index         color166        color160        "~="                       # duplicated messages
+
+# message headers ------------------------------------------------------
+
+color hdrdefault    color249        default
+color header        color95         default        "^(From)"
+color header        color31         default        "^(Subject)"
+
+# body -----------------------------------------------------------------
+
+color quoted        color58         default
+color quoted1       color60         default
+color quoted2       color101        default
+color quoted3       color138        default
+color quoted4       color217        default
+
+color signature     color240        default
+color bold          color235        default
+color underline     color235        default
+color normal        color253        default
+#
+color body          color245        default        "[;:][-o][)/(|]"    # emoticons
+color body          color245        default        "[;:][)(|]"         # emoticons
+color body          color245        default        "[*]?((N)?ACK|CU|LOL|SCNR|BRB|BTW|CWYL|\
+                                                     |FWIW|vbg|GD&R|HTH|HTHBE|IMHO|IMNSHO|\
+                                                     |IRL|RTFM|ROTFL|ROFL|YMMV)[*]?"
+color body          color245        default        "[ ][*][^*]*[*][ ]?" # more emoticon?
+color body          color245        default        "[ ]?[*][^*]*[*][ ]" # more emoticon?
+
+# yes, an insance URL regex
+color body          color95         default        "([a-z][a-z0-9+-]*://(((([a-z0-9_.!~*'();:&=+$,-]|%[0-9a-f][0-9a-f])*@)?((([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?|[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+)(:[0-9]+)?)|([a-z0-9_.!~*'()$,;:@&=+-]|%[0-9a-f][0-9a-f])+)(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?(#([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?|(www|ftp)\\.(([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?(:[0-9]+)?(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?(#([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?)[^].,:;!)? \t\r\n<>\"]"
+# and a heavy handed email regex
+color body          color95         default        "((@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\]),)*@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\]):)?[0-9a-z_.+%$-]+@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\])"
+
+# Various smilies and the like
+color body          color136        default        " [;:]-*[})>{(<|]"                  # :-) etc...
+
+# *bold*
+color body          color166        default        "(^|[[:space:][:punct:]])\\*[^*]+\\*([[:space:][:punct:]]|$)"
+# _underline_
+color body          color167        default        "(^|[[:space:][:punct:]])_[^_]+_([[:space:][:punct:]]|$)"
+# /italic/  (Sometimes gets directory names)
+color body          color168        default        "(^|[[:space:][:punct:]])/[^/]+/([[:space:][:punct:]]|$)"
+
+# sidebar
+color sidebar_new   color101        default
 

.mutt/conf/macros

@@ -19,7 +19,7 @@ macro	index,pager	<f5>	"<change-folder> =.Trash<enter>"		"Change folder for Tras
 macro	index,pager	<f10>	"<change-folder> =<enter>"			"Change folder for INBOX"
 
 macro	index,pager	B	"<enter-command>toggle sidebar_visible<enter>"	"Toggle sidebar visibility"
-macro	index		\cx	"<tag-pattern>~N<enter><tag-prefix><toggle-new><tag-prefix><clear-flag>*" "Mark all new messages as read"
+macro	index		\cx	"<tag-pattern>~N|~O<enter><tag-prefix><toggle-new><tag-prefix><clear-flag>*" "Mark all new messages as read"
 
 macro	index,pager	S	"<enter-command>unset wait_key<enter><bounce-message>spam@localhost<enter><enter-command>set wait_key<delete-message>" "Bounce message to AntiSpam (spam)"
 macro	index,pager	H	"<enter-command>unset wait_key<enter><bounce-message>ham@localhost<enter><enter-command>set wait_key" "Bounce message to AntiSpam (ham)"

.mutt/conf/mailboxes

@@ -18,8 +18,10 @@ mailboxes +.logs
 mailboxes +.openics
 mailboxes +.openics.nantes2k-discuss
 mailboxes +.openics.echo
+mailboxes +.openics.dusizan
 
 mailboxes +.abul
+mailboxes +.abul.echo
 mailboxes +.abul.asso
 mailboxes +.abul.ca
 mailboxes +.abul.web
@@ -31,6 +33,10 @@ mailboxes +.abul.debutants
 mailboxes +.abul.devel
 mailboxes +.abul.tresorier
 
+mailboxes +.linux-nantes
+mailboxes +.linux-nantes.linux-nantes
+mailboxes +.linux-nantes.linuxaction
+
 mailboxes +.sud-ouest
 mailboxes +.sud-ouest.ca
 mailboxes +.sud-ouest.asso
@@ -45,6 +51,7 @@ mailboxes +.aquilenet.asso
 
 mailboxes +.rmll
 mailboxes +.rmll.comite
+mailboxes +.rmll.discussion
 mailboxes +.rmll.admins
 mailboxes +.rmll.resa
 mailboxes +.rmll.11
@@ -57,6 +64,7 @@ mailboxes +.rmll.11.participants
 
 mailboxes +.debian-france
 mailboxes +.debian-france.ag
+mailboxes +.debian-france.bureau
 mailboxes +.debian-france.abonnes
 mailboxes +.debian-france.asso
 mailboxes +.debian-france.cabal
@@ -90,6 +98,7 @@ mailboxes +.debian.bugs
 
 mailboxes +.weechat
 mailboxes +.weechat.dev
+mailboxes +.weechat.cvs
 
 mailboxes +.sympa
 mailboxes +.sympa.announce

.tmux.conf

@@ -15,7 +15,7 @@ set -g default-terminal "screen-256color"
 set -g history-limit 1000
 set -g update-environment "DISPLAY WINDOWID SSH_AUTH_SOCK SSH_AGENT_PID SSH_CONNECTION"
 #set -g terminal-overrides 'xterm*:smcup@:rmcup@'
-setw -g mode-mouse on
+setw -g mode-mouse off
 
 ### Backport some “screen” setting ###
 #

.vim/vimrc

@@ -172,7 +172,7 @@ set infercase "smart case support
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 if has('autocmd')
 	autocmd BufRead ~/.mutt/tmp/mutt-* set filetype=mail
-	autocmd FileType mail set autoindent expandtab formatoptions=tcqna
+	autocmd FileType mail set autoindent expandtab formatoptions=tcqn
 	autocmd FileType mail vmap D dO[...]<CR>
 	autocmd FileType mail call EnableSpellChecking()
 endif