clean zsh config, update muttng config

.muttng/conf/mailboxes

@@ -26,10 +26,11 @@ mailboxes =my.irc
 mailboxes =my.soft.debian.misc
 mailboxes =my.soft.debian.asso
 mailboxes =my.soft.debian.bts
-mailboxes =my.soft.debian.pkg.dudki
 mailboxes =my.soft.debian.pkg.ffproxy
 mailboxes =my.soft.debian.pkg.kio-apt
 mailboxes =my.soft.debian.pkg.kwin-style-knifty
+mailboxes =my.soft.debian.pkg.incron
+mailboxes =my.soft.debian.pkg.dudki
 mailboxes =my.soft.debian.pkg.konqburn
 
 mailboxes =my.soft.weechat.ml.cvs

.muttngrc

@@ -14,6 +14,8 @@ set from            = "kolter@openics.org"
 set signature       = "~/.signatures/kolter_openics"
 alternates          "kolter|emmanuel\.bouthenot|openics\.org|netconfig|bouthenot\.name"
 
+set use_envelope_from = yes                      # set return-path to from instead of user@hostname
+
 set locale          = "fr_FR.UTF-8"
 set charset         = "utf-8"
 
@@ -59,6 +61,9 @@ set edit_headers         = no
 set query_command        = "abook --mutt-query '%s'"
 set sleep_time           = 0
 
+set smart_wrap           = yes                    # force wrapping of long lines
+set wrapmargin           = 10                     # margin of wraped lines
+
 auto_view text/html
 alternative_order text/enriched text/plain text
 

.zsh.d/config.d/alias.zsh

@@ -4,7 +4,7 @@ alias rm="rm -i"
 alias mv="mv -i"
 alias cp="cp -i"
 alias vlock="clear; vlock"
-alias lm="tail -n 60 -f /var/log/messages"
+alias lm="tail -n 60 -f /var/log/syslog"
 alias df="df -h"
 alias emacs="emacs -nw"
 alias e="emacs -nw"

.zsh.d/config.d/history.zsh

@@ -1,9 +1,9 @@
 
 # history options
 
-setopt EXTENDED_HISTORY		# add a timestamp and the duration of each command
-setopt SHARE_HISTORY	 	# _all_ zsh sessions share the same history files
-setopt HIST_IGNORE_ALL_DUPS	# ignores duplications
+setopt extendedhistory		# add a timestamp and the duration of each command
+setopt sharehistory	 	# _all_ zsh sessions share the same history files
+setopt histignorealldups	# ignores duplications
 
 HISTDIR=$DOTZSHDIR/history
 [ ! -d $HISTDIR ] && mkdir -p $HISTDIR

.zsh.d/config.d/options.zsh

@@ -10,7 +10,9 @@ setopt always_to_end	# move to cursor to the end after completion
 setopt notify		# report the status of backgrounds jobs immediately
 setopt correct		# try to correct the spelling if possible
 setopt rmstarwait	# wait 10 seconds before querying for a rm which contains a *
+setopt noflowcontrol    # disable xon/xoff
+setopt histnostore      # don't store history command in history
+setopt nobanghist       # don't care of '!' in commands
+setopt emacs            # zle in emacs mode
+setopt pushdignoredups  # ignore dups in pushd stack
 #setopt printexitvalue   # show the exit-value if > 0
-
-# Don't ecrase file with >, use >| (overwrite) or >> (append) instead 
-#set -C

.zsh.d/os.d/Debian.zsh

@@ -0,0 +1,3 @@
+
+# Debian stuff
+

.zsh.d/os.d/FreeBSD.zsh

@@ -1,6 +1,8 @@
 
+# FreeBSD stuff
+
 # using colortail if available
-[ -x "$(whence colortail)" ] && alias lm="colortail -n 60 -k /usr/local/share/examples/colortail/conf.messages -f /var/log/messages"
+[ -x "$(whence colortail)" ] && alias lm="colortail -n 60 -k /usr/local/share/examples/colortail/conf.messages -f /var/log/syslog"
 
 # GNU ls(1) from FreeBSD ports is called gnuls(1).
 if [ -x "$(whence gnuls)" ]; then
@@ -27,7 +29,7 @@ else
     fi
 fi
 
-# GNU tar from SunOS ports is called gtar 
+# GNU tar is called gtar 
 [ -x "$(whence gtar)" ] && alias tar="gtar"
 
 # GNU find is called gfind

.zsh.d/os.d/Linux.zsh

@@ -1,5 +1,6 @@
 
-# debian config
+# Linux Stuff
+
 [ -r /etc/debian_version ] && source $DOTZSHDIR/os.d/Debian.zsh
 
 if [ "$TERM" != "dumb" ]; then

.zsh.d/os.d/OpenBSD.zsh

@@ -1,4 +1,6 @@
 
+# OpenBSD stuff
+
 # GNU ls(1) from OpenBSD ports is named gls(1)/gdircolors(1).
 if [ -x "$(whence gdircolors)" ]; then
     if [ -r "$DOTZSHDIR/config/dircolors" ]; then
@@ -28,7 +30,7 @@ else
     alias ls="ls -Fh"
 fi
 
-# GNU tar from SunOS ports is called gtar 
+# GNU tar is called gtar 
 [ -x "$(whence gtar)" ] && alias tar="gtar"
 
 # GNU find is called gfind

.zsh.d/os.d/SunOS.zsh

@@ -1,4 +1,6 @@
 
+# SunOS, Solaris Stuff
+
 PATH=$PATH:/usr/ccs/bin:/usr/sfw/bin:/usr/openwin/bin
 
 MANPATH=/usr/man
@@ -33,7 +35,7 @@ if [ -x "$(whence gdircolors)" ]; then
     fi
 fi
 
-# GNU tar from SunOS ports is called gtar 
+# GNU tar is called gtar 
 [ -x "$(whence gtar)" ] && alias tar="gtar"
 
 # GNU find is called gfind

.zshenv

@@ -1,5 +1,7 @@
 
 export LANG=fr_FR.UTF-8
+
+[ ! -d ~/tmp ] && mkdir ~/tmp
 export TMPDIR=~/tmp
 
 [ -f /etc/debian_chroot ] && export DISPLAY=:0.0