clean muttng ans maildrop config, minor changes in .zshrc

.mailfilter

@@ -6,13 +6,7 @@ VERBOSE=9
 
 logfile "/home/manu/logs/maildrop/maildrop.log"
 
-########### hurd lists ###############
-if (/^List-Id: <debian-hurd\.lists\.debian\.org>$/)
-        to $MAILDIR/.my.ml.hurd.debian
-if (/^List-Id:.*<hurdfr\.hurdfr\.org>$/)
-        to $MAILDIR/.my.ml.hurd.hurdfr
-
-########### debian lists ###############
+### Debian Lists
 if (/^List-Id: <debian-!.*!\.lists\.debian\.org>.*$/)
 {
 	exception {
@@ -23,32 +17,40 @@ if (/^List-Id: <debian-!.*!\.lists\.debian\.org>.*$/)
 	}
 }
 
+### Debian France Lists
 if (/^List-Id: <!.*!\.france\.debian\.net>.*$/)
         to $MAILDIR/.my.ml.debian.france.$MATCH2
 
-########### asyd lists ###############
+### Hurd France Lists
+if (/^List-Id:.*<hurdfr\.hurdfr\.org>$/)
+        to $MAILDIR/.my.ml.hurd.hurdfr
+
+### Asyd Lists
+if (/^List-Id:.*mailman\.asyd\.net>.*$/)
+        to $MAILDIR/
+
 if (/^List-Id:.*<!.*!\.asyd\.net>.*$/)
         to $MAILDIR/.my.ml.asyd.$MATCH2
 
-########### abul lists ###############
+### Abul Lists
 if (/^List-Id:.*<!.*!.abul.org>;*$/)
         to $MAILDIR/.my.ml.abul.$MATCH2
 
-########### WeeChat lists ###############
-if (/^List-Id:.*weechat-!.*!.nongnu.org.*$/)
+### WeeChat Lists
+if (/^List-Id:.*weechat-!.*!.nongnu.org.*$/ || /^To:.*weechat-!.*!.nongnu.org.*$/)
         to $MAILDIR/.my.soft.weechat.ml.$MATCH2
 
-########### Logs Stuff ###############
+### Logs Stuff
 if (/^From:.*logcheck@/ || /^Subject:.*rkhunter/)
         to $MAILDIR/.sys.reports
 
-########### Tiac Info ###############
+### Tiac Info
 if (/^Subject:.*[tT][iI][aA][cC].*[iI][nN][fF][oO]/)
 {
     to $MAILDIR/.friends.tbs.tiacfooting
 }
 
-########### Spam ###############
+### Spam
 
 xfilter "spamc"
 if (/^X-Spam-Status: YES/)

.muttng/conf/identities

@@ -9,24 +9,6 @@
 # Identities settings for Muttng.
 #
 
-#folder-hook . set signature="~/.signatures/kolter_openics"
-#folder-hook . my_hdr From: Emmanuel Bouthenot <kolter@openics.org>
-
-folder-hook weechat\.ml.*|ml\.debian.*|ml\.hurd\.hurdfr|ml\.abul.*|ml\.lna.*|ml\.asyd.*|ml\.gulliver.* my_hdr Reply-To: kolter@openics.org
-folder-hook weechat\.ml.*|ml\.debian.*|ml\.hurd\.hurdfr|ml\.abul.*|ml\.lna.*|ml\.asyd.*|ml\.gulliver.* my_hdr User-Agent: $user_mua
-folder-hook weechat\.ml.*|ml\.debian.*|ml\.hurd\.hurdfr|ml\.abul.*|ml\.lna.*|ml\.asyd.*|ml\.gulliver.* my_hdr X-Operating-System: $user_os
-folder-hook weechat\.ml.*|ml\.debian.*|ml\.hurd\.hurdfr|ml\.abul.*|ml\.lna.*|ml\.asyd.*|ml\.gulliver.* my_hdr X-GnuPG-KeyID: $user_gpg_id
-folder-hook weechat\.ml.*|ml\.debian.*|ml\.hurd\.hurdfr|ml\.abul.*|ml\.lna.*|ml\.asyd.*|ml\.gulliver.* my_hdr X-GPG-Fingerprint: $user_gpg_fprint
-folder-hook weechat\.ml.*|ml\.debian.*|ml\.hurd\.hurdfr|ml\.abul.*|ml\.lna.*|ml\.asyd.*|ml\.gulliver.* set signature="~/.signatures/kolter_openics"
-
-folder-hook weechat\.ml.*	my_hdr From: kolter <kolter+dev@openics.org>
-folder-hook ml\.debian.* 	my_hdr From: Emmanuel Bouthenot <kolter+deb@openics.org>
-folder-hook ml\.hurd\.hurdfr	my_hdr From: Emmanuel Bouthenot <kolter+hurd@openics.org>
-folder-hook ml\.abul.*		my_hdr From: Emmanuel Bouthenot <kolter+abul@openics.org>
-folder-hook ml\.lna.*		my_hdr From: Emmanuel Bouthenot <kolter+lna@openics.org>
-folder-hook ml\.asyd.*		my_hdr From: Emmanuel Bouthenot <kolter+dev@openics.org>
-folder-hook ml\.gulliver.*	my_hdr From: Emmanuel Bouthenot <kolter+gull@openics.org>
-
 folder-hook .*\ml\..*		unmy_hdr Reply-To:
 folder-hook .*\ml\..*		unmy_hdr Bcc:
 

.muttng/conf/macros

@@ -17,7 +17,7 @@ macro index,pager <f3>	"<change-folder> =Draft<enter>"			"Change folder for Draf
 macro index,pager <f4>	"<change-folder> =Spam<enter>"			"Change folder for Spam"
 macro index,pager <f5>	"<change-folder> =Trash<enter>"			"Change folder for Trash"
 
-macro index,pager B		"<enter-command>toggle sidebar_visible<enter>"	"Toggle sidebar visibility"
+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"
 

.muttng/conf/mailboxes

@@ -40,6 +40,7 @@ mailboxes =my.ml.asyd.sysadmin
 mailboxes =my.ml.asyd.shell
 mailboxes =my.ml.asyd.emacs
 
+mailboxes =my.soft.abul.admin
 mailboxes =my.ml.abul.asso
 mailboxes =my.ml.abul.tech
 mailboxes =my.ml.abul.debutants
@@ -48,18 +49,24 @@ mailboxes =my.ml.abul.annonces
 mailboxes =my.ml.abul.party
 mailboxes =my.ml.abul.devel
 
+
+mailboxes =my.ml.debian.france.asso
+mailboxes =my.ml.debian.france.sl
+
 mailboxes =my.ml.debian.announce
-mailboxes =my.ml.debian.mentors
-mailboxes =my.ml.debian.devel
-mailboxes =my.ml.debian.devel-changes
+mailboxes =my.ml.debian.project
+mailboxes =my.ml.debian.vote
+mailboxes =my.ml.debian.security
+
 mailboxes =my.ml.debian.devel-announce
+mailboxes =my.ml.debian.devel
 mailboxes =my.ml.debian.devel-french
+mailboxes =my.ml.debian.mentors
+mailboxes =my.ml.debian.devel-changes
 mailboxes =my.ml.debian.user-french
-mailboxes =my.ml.debian.security
-mailboxes =my.ml.debian.france.asso
-mailboxes =my.ml.debian.france.ml
 
-mailboxes =my.ml.hurd.debian
+
+mailboxes =my.ml.debian.hurd
 mailboxes =my.ml.hurd.hurdfr
 
 mailboxes =computer.shop.ebay

.muttng/conf/my-headers

@@ -9,10 +9,9 @@
 # Mail headers settings for Muttng.
 #
 
-# Ignore headers
-unmy_hdr *
+my_hdr From: $realname <$from>
 
-# defines
+# define headers
 my_hdr User-Agent: $user_mua
 my_hdr X-Operating-System: $user_os
 my_hdr X-GnuPG-KeyID: $user_gpg_id

.muttngrc

@@ -9,12 +9,12 @@
 # Global configuration file for Muttng.
 #
 
-set realname        = "emmanuel Bouthenot"
+set realname        = "Emmanuel Bouthenot"
 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 use_envelope_from = yes                      # set return-path to from instead of user@hostname
 
 set locale          = "fr_FR.UTF-8"
 set charset         = "utf-8"

.zsh.d/zshrc

@@ -50,7 +50,7 @@ local os=$(uname)
 # using 'sudo zsh'
 if [ "$SUDO_USER" -a $UID = 0 ]; then
     # define root history path
-    export HISTFILE="/root/.zsh_history"
+    export HISTFILE="$DOTZSHDIR/history/history_root"
     
     # ugly hack : reset some file perms to normal to avoid warnings
     chmod 0644 ~/.zcompdump