4 files changed, 117 insertions, 139 deletions
diff --git a/dot_mutt/color.rc b/dot_mutt/color.rc
index 4e44cc4..94e6817 100644
--- a/dot_mutt/color.rc
+++ b/dot_mutt/color.rc
@@ -66,14 +66,16 @@ color underline   color223 color239
 color sidebar_divider    color250 default
 color sidebar_new        color142 default
 
-color index color142 default ~N
-color index color108 default ~O
-color index color109 default ~P
-color index color234 color214 ~F
-color index color175 default ~Q
-color index color167 default ~=
-color index color234 color223 ~T
-color index color234 color167 ~D
+# Note that the the last matching pattern is the
+# one that gets used, so order matters
+color index color142 default  ~N # new messages
+color index color108 default  ~O # old messages
+color index color109 default  ~P # message is from you (consults $alternates)
+color index color175 default  ~Q # messages which have been replied to
+color index color167 default  ~= # duplicate
+color index color234 color214 ~F # flagged messages
+color index color234 color223 ~T # tagged messages
+color index color234 color167 ~D # deleted messages
 
 color header color214 default "^(To|From):"
 color header color142 default "^Subject:"
diff --git a/dot_mutt/encrypted_alias-mcgill.rc.asc b/dot_mutt/encrypted_alias-mcgill.rc.asc
index 1667c8a..21fc93b 100644
--- a/dot_mutt/encrypted_alias-mcgill.rc.asc
+++ b/dot_mutt/encrypted_alias-mcgill.rc.asc
@@ -1,41 +1,40 @@
 -----BEGIN PGP MESSAGE-----
 
-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
-MDE=
-=J23l
+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
+oEGlBXpwP1XcBb3o
+=hW88
 -----END PGP MESSAGE-----
diff --git a/dot_mutt/encrypted_private_alias.rc.asc b/dot_mutt/encrypted_private_alias.rc.asc
index 2239e9a..cad1bcf 100644
--- a/dot_mutt/encrypted_private_alias.rc.asc
+++ b/dot_mutt/encrypted_private_alias.rc.asc
@@ -1,66 +1,67 @@
 -----BEGIN PGP MESSAGE-----
 
-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
-YpK8UZkzRjPfNu7sr0f6KJtvxj/UsWg3xG6x
-=3hYr
+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
+=x/sG
 -----END PGP MESSAGE-----
diff --git a/dot_mutt/mailinglists.rc b/dot_mutt/mailinglists.rc
index 4f269b9..a05be8f 100644
--- a/dot_mutt/mailinglists.rc
+++ b/dot_mutt/mailinglists.rc
@@ -1,30 +1,6 @@
-subscribe -group ML.kubuntu-bugs kubuntu-bugs@lists.ubuntu.com
-subscribe -group ML.kubuntu-devel kubuntu-devel@lists.ubuntu.com
-subscribe -group ML.kubuntu-users kubuntu-users@lists.ubuntu.com
-subscribe -group ML.ubuntu-ca ubuntu-ca@lists.ubuntu.com
-subscribe -group ML.ubuntu-classroom ubuntu-classroom@lists.ubuntu.com
-subscribe -group ML.ubuntu-devel-announce ubuntu-devel-announce@lists.ubuntu.com
-subscribe -group ML.ubuntu-doc ubuntu-doc@lists.ubuntu.com
-subscribe -group ML.ubuntu-website ubuntu-website@lists.canonical.com
-subscribe -group ML.ubuntu .*@.*lists.ubuntu.com
-
-subscribe -group ML.debian-devel debian-devel@lists.debian.org
-subscribe -group ML.debian-devel-announce debian-devel-announce@lists.debian.org
-subscribe -group ML.debian-devel-fr debian-devel-fr@lists.debian.org
-subscribe -group ML.debian-haskell debian-haskell@lists.debian.org
-subscribe -group ML.debian-mentors debian-mentors@lists.debian.org
-subscribe -group ML.debian-project debian-python@lists.debian.org
-subscribe -group ML.debian-python debian-python@lists.debian.org
-subscribe -group ML.debian-qt-kde debian-qt-kde@lists.debian.org
-subscribe -group ML.pkg-kde-talk pkg-kde-talk@lists.debian.org
-subscribe -group ML.pkg-multimedia-commits pkg-multimedia-commits@lists.alioth.debian.org
-subscribe -group ML.pkg-multimedia-maintainers pkg-multimedia-maintainers@lists.alioth.debian.org
-subscribe -group ML.python-apps-team python-apps-team@lists.debian.org
-subscribe -group ML.debian .*@.*lists.debian.org, .*@.*lists.alioth.debian.org
-
-subscribe -group ML.openbsd-misc misc@opensmtpd.org
-
-subscribe -group ML.frescobaldi frescobaldi@googlegroups.com
-
-subscribe -group ML.cmu .*@lists.andrew.cmu.edu
-subscribe -group ML.concertrg concertrg@cs.cmu.edu
+subscribe -group ml.cmu .*@lists.andrew.cmu.edu (cs-phd-students|pop-group|concertrg)@cs.cmu.edu
+subscribe -group ml.debian .*@.*lists.debian.org
+subscribe -group ml.openbsd (bugs|misc)@opensmtpd.org
+subscribe -group ml.opensmtpd misc@opensmtpd.org
+subscribe -group ml.ubuntu .*@.*lists.ubuntu.com
+subscribe -group ml.mcgill (complogic)@cs.mcgill.ca