Browse Source

add quilt config
minor changes in muttng config

Emmanuel Bouthenot 16 years ago
parent
commit
7a76c432de
8 changed files with 66 additions and 31 deletions
  1. 12 2
      .mailfilter
  2. 11 11
      .muttng/conf/colors
  3. 4 1
      .muttng/conf/headers
  4. 7 5
      .muttng/conf/keys
  5. 3 1
      .muttng/conf/macros
  6. 21 10
      .muttng/conf/mailboxes
  7. 1 1
      .muttng/conf/subscribes
  8. 7 0
      .quiltrc

+ 12 - 2
.mailfilter

@@ -34,14 +34,24 @@ if (/^List-Id:.*mailman\.asyd\.net>.*$/)
 if (/^List-Id:.*<!.*!\.asyd\.net>.*$/)
         to $MAILDIR/.my.ml.asyd.$MATCH2
 
+### Galette Lists
+if (/^List-Id:.*<galette-!.*!\.gna\.org>.*$/)
+        to $MAILDIR/.my.soft.galette.$MATCH2
+
 ### Abul Lists
-if (/^List-Id:.*<!.*!.abul.org>;*$/)
+if (/^List-Id:.*<!.*!\.abul\.org>.*$/)
         to $MAILDIR/.my.ml.abul.$MATCH2
 
 ### WeeChat Lists
-if (/^List-Id:.*weechat-!.*!.nongnu.org.*$/ || /^To:.*weechat-!.*!.nongnu.org.*$/)
+if (/^List-Id:.*weechat-!.*!\.nongnu\.org.*$/ || /^To:.*weechat-!.*!\.nongnu.org\.*$/)
         to $MAILDIR/.my.soft.weechat.ml.$MATCH2
 
+### Sympa Stuff
+if (/^From:.*SYMPA/)
+{
+    to $MAILDIR/.sys.sympa
+}
+
 ### Logs Stuff
 if (/^From:.*logcheck@/ || /^Subject:.*rkhunter/)
         to $MAILDIR/.sys.reports

+ 11 - 11
.muttng/conf/colors

@@ -12,9 +12,9 @@
 # Default colour definitions
 color normal     default      default
 color message    brightwhite  default
-color status     brightyellow cyan
-color hdrdefault cyan         default
-color indicator	 brightwhite  magenta
+color status     brightblue   default
+color hdrdefault yellow       default
+color indicator	 brightwhite  cyan
 
 
 color quoted   cyan      default
@@ -30,7 +30,7 @@ color quoted8  brightred default
 
 color signature  white       default
 color tilde      white       default
-color tree       brightred   default
+color tree       brightblue  default
 color attachment brightgreen default
 # color error      red          white
 # color search     brightwhite  magenta
@@ -44,13 +44,13 @@ mono underline underline
 mono indicator reverse
 
 # Colours for items in the reader
-color header yellow  default "^From\:|^To\:|^Cc\:|\Bcc\:"
-color header magenta default "^Date\:"
-color header blue    default "^Reply-To\:"
-color header red     default "\Subject\:"
+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 green     default ~N           # New messages.
+color index yellow    default ~N           # New messages.
 color index green     default ~O           # Old messages.
 color index brightred default ~D           # Deletes messages.
 # color index brightgreen white "~N (~x hagbard\.davep\.org | ~h \"^In-[Rr]eply-[Tt]o: .*hagbard\.davep\.org\")"
@@ -85,5 +85,5 @@ color body brightred default "(^|[[:space:]])_[^[:space:]]+_([[:space:]]|$)"
 color body brightred default "(^|[[:space:]])/[^[:space:]]+/([[:space:]]|$)"     # /Italic/ text.
 
 # Sidebar color
-color sidebar_new brightred default
-color sidebar cyan default
+color sidebar_new yellow default
+color sidebar yellow default

+ 4 - 1
.muttng/conf/headers

@@ -14,6 +14,7 @@ ignore *
 
 # Then un-ignore the ones I want to see
 unignore From:
+unignore Resent-From:
 unignore Subject:
 unignore To:
 unignore Cc:
@@ -23,6 +24,7 @@ unignore Reply-To:
 unignore Mail-Followup-To:
 unignore Followup-To:
 unignore Date:
+unignore Resent-Date:
 unignore Organization:
 unignore User-Agent:
 unignore X-Mailer:
@@ -54,8 +56,9 @@ unignore X-Originating-Email:
 unignore X-Bogosity:
 unignore X-Operating-System:
 unignore X-Apparently-From:
+unignore X-Virus-Scanned
 
 # Now order the visable header lines
-hdr_order From: Subject: To: Cc: Bcc: Return-Path: Reply-To: Mail-Followup-To: Followup-To: Date: Organization: User-Agent: X-Mailer: X-Newsreader: Newsgroups: Summary: Keywords: Mail-Copies-To: Sender: X-Sent: X-Mailman-Version: Posted-To: Mail-Copies-To: Apparently-To: Gnus-Warning: Resent-From: X-Accept-Language: gpg-key-ID: X-GPG-Fingerprint: fingerprint: X-Spam-Status: X-Junked-Because: X-SpamProbe: X-Virus-hagbard: X-Originating-IP: X-Originating-Email:
+hdr_order From: Resent-From: Subject: To: Cc: Bcc: Return-Path: Reply-To: Mail-Followup-To: Followup-To: Date: Resent-Date: Organization: User-Agent: X-Mailer: X-Newsreader: Newsgroups: Summary: Keywords: Mail-Copies-To: Sender: X-Sent: X-Mailman-Version: Posted-To: Mail-Copies-To: Apparently-To: Gnus-Warning: Resent-From: X-Accept-Language: gpg-key-ID: X-GPG-Fingerprint: fingerprint: X-Spam-Status: X-Junked-Because: X-SpamProbe: X-Virus-hagbard: X-Originating-IP: X-Originating-Email:
 
 

+ 7 - 5
.muttng/conf/keys

@@ -18,8 +18,10 @@ bind index,pager \cp sidebar-prev
 bind index,pager \cn sidebar-next
 bind index,pager \co sidebar-open
 
-bind index,pager <left>  sidebar-prev
-bind index,pager <right> sidebar-next
-bind index,pager *       sidebar-open
-bind index,pager <F11>   sidebar-scroll-up
-bind index,pager <F12>   sidebar-scroll-down
+bind index,pager <left>        sidebar-prev
+bind index,pager <right>       sidebar-next
+bind index,pager *             sidebar-open
+bind index,pager <F11>         sidebar-scroll-up
+#bind index,pager \c<PageUp>    sidebar-scroll-up
+bind index,pager <F12>         sidebar-scroll-down
+#bind index,pager \c<PageDown>  sidebar-scroll-down

+ 3 - 1
.muttng/conf/macros

@@ -27,4 +27,6 @@ macro index \cx "<tag-pattern>~N<enter><tag-prefix><toggle-new><tag-prefix><clea
 
 # spamassassin macros
 macro index,pager \ch "<enter-command>unset wait_key<enter><pipe-message>sa-learn --forget<enter><pipe-message>sa-learn --ham --no-sync<enter><enter-command>set wait_key<enter>"	"Set message as HAM"
-macro index,pager \cs "<enter-command>unset wait_key<enter><pipe-message>sa-learn --forget<enter><pipe-message>sa-learn --spam --no-sync<enter><enter-command>set wait_key<enter><save-message>=Spam<enter>" "Set message as SPAM"
+
+#macro index,pager \cs "<enter-command>unset wait_key<enter><pipe-message>sa-learn --forget<enter><pipe-message>sa-learn --spam --no-sync<enter><enter-command>set wait_key<enter><save-message>=Spam<enter>" "Set message as SPAM"
+macro index,pager \cs "<enter-command>unset wait_key<enter><bounce-message>spam@kaoru<enter><enter-command>set wait_key<enter><save-message>=.Spam<enter>" "Set message as SPAM"

+ 21 - 10
.muttng/conf/mailboxes

@@ -9,12 +9,13 @@
 # Mailboxes settings for Muttng.
 #
 
-mailboxes = '+.Draft'
+mailboxes = '+.Drafts'
 mailboxes = '+.Sent'
 mailboxes = '+.Spam'
 mailboxes = '+.Trash'
 
 mailboxes = '+.sys.dak'
+mailboxes = '+.sys.sympa'
 mailboxes = '+.sys.reports'
 mailboxes = '+.sys.infos'
 
@@ -31,6 +32,7 @@ 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.hiawatha'
+mailboxes = '+.my.soft.galette.devel'
 #mailboxes = '+.my.soft.debian.pkg.dudki'
 #mailboxes = '+.my.soft.debian.pkg.konqburn'
 
@@ -42,14 +44,18 @@ mailboxes = '+.my.ml.asyd.emacs'
 
 mailboxes = '+.my.ml.abul.misc'
 mailboxes = '+.my.ml.abul.admin'
+mailboxes = '+.my.ml.abul.ca'
 mailboxes = '+.my.ml.abul.asso'
 mailboxes = '+.my.ml.abul.tech'
 mailboxes = '+.my.ml.abul.debutants'
 mailboxes = '+.my.ml.abul.blahblah'
 mailboxes = '+.my.ml.abul.annonces'
+mailboxes = '+.my.ml.abul.abonnes'
+mailboxes = '+.my.ml.abul.inscrits'
 mailboxes = '+.my.ml.abul.party'
 mailboxes = '+.my.ml.abul.devel'
-
+mailboxes = '+.my.ml.abul.web'
+mailboxes = '+.my.ml.abul.hourtin'
 
 mailboxes = '+.my.ml.debian.france.asso'
 mailboxes = '+.my.ml.debian.france.sl'
@@ -60,6 +66,7 @@ mailboxes = '+.my.ml.debian.vote'
 mailboxes = '+.my.ml.debian.security'
 mailboxes = '+.my.ml.debian.security-announce'
 
+mailboxes = '+.my.ml.debian.newmaint'
 mailboxes = '+.my.ml.debian.devel-announce'
 mailboxes = '+.my.ml.debian.devel'
 mailboxes = '+.my.ml.debian.devel-french'
@@ -71,20 +78,24 @@ mailboxes = '+.my.ml.debian.news-french'
 mailboxes = '+.my.ml.debian.hurd'
 mailboxes = '+.my.ml.hurd.hurdfr'
 
-mailboxes = '+.computer.fon'
-mailboxes = '+.computer.shop.ebay'
-mailboxes = '+.computer.paypal'
+#mailboxes = '+.computer.fon'
+#mailboxes = '+.computer.shop.ebay'
+#mailboxes = '+.computer.paypal'
 
 mailboxes = '+.friends.tbs.tiacfooting'
-mailboxes = '+.friends.all.alexis'
-mailboxes = '+.friends.all.jm'
-mailboxes = '+.friends.all.ge'
+#mailboxes = '+.friends.all.alexis'
+#mailboxes = '+.friends.all.jm'
+#mailboxes = '+.friends.all.ge'
+
+#mailboxes = '+.my.pro.jobs'
 
-mailboxes = '+.my.pro.jobs'
+###
+# NewsGroups
+#
+###
 
 mailboxes nntp://news.free.fr/proxad.dedibox.discussions
 mailboxes nntp://news.free.fr/proxad.dedibox.discussions.securite
 mailboxes nntp://news.free.fr/proxad.dedibox.annonces
 mailboxes nntp://news.free.fr/proxad.dedibox.maintenances
 mailboxes nntp://news.free.fr/proxad.dedibox.incidents
-

+ 1 - 1
.muttng/conf/subscribes

@@ -11,7 +11,7 @@
 
 subscribe weechat-(dev|cvs)
 subscribe debian-.*@lists\.debian\.org
-subscribe .*@abul\.org
+subscribe (ca|asso|abonnes|inscrits|tech|debutants|blahblah|annonces|party|devel|web|hourtin)@abul\.org
 subscribe linuxaction
 subscribe hurdfr@hurdfr\.org
 subscribe (shell|emacs|sysadmin)@asyd\.net

+ 7 - 0
.quiltrc

@@ -0,0 +1,7 @@
+QUILT_PATCH_OPTS="--unified-reject-files" 
+QUILT_REFRESH_ARGS="-p ab --no-timestamps --no-index" 
+QUILT_DIFF_ARGS="-p ab --no-timestamps --no-index --color=auto" 
+
+QUILT_PATCHES="debian/patches" 
+QUILT_COLORS="diff_hdr=1;32:diff_add=1;34:diff_rem=1;31:diff_hunk=1;33:diff_ctx=35:diff_cctx=33"
+