15 files changed, 48 insertions, 23 deletions
diff --git a/.config/mutt/accounts.rc b/.config/mutt/accounts.rc
index 25aca00..fadc20d 100644
--- a/.config/mutt/accounts.rc
+++ b/.config/mutt/accounts.rc
@@ -1,7 +1,11 @@
 # dave@sleepmap.de (default)
 set spoolfile = "+dave@sleepmap.de/INBOX"
-source ".config/mutt/dave@sleepmap.de.rc"
-folder-hook dave@sleepmap.de/* source .config/mutt/dave@sleepmap.de.rc
+source "~/.config/mutt/dave@sleepmap.de.rc"
+folder-hook dave@sleepmap.de/* source "~/.config/mutt/dave@sleepmap.de.rc"
 
 # dvzrv@archlinux.org
-folder-hook dvzrv@archlinux.org/* source .config/mutt/dvzrv@archlinux.org.rc
+folder-hook dvzrv@archlinux.org/* source "~/.config/mutt/dvzrv@archlinux.org.rc"
+
+# mediation-team@archlinux.org
+folder-hook mediation-team@archlinux.org/* source "~/.config/mutt/mediation-team@archlinux.org.rc"
+# vi: ft=muttrc
diff --git a/.config/mutt/attachments.rc b/.config/mutt/attachments.rc
index 693f174..f082fe6 100644
--- a/.config/mutt/attachments.rc
+++ b/.config/mutt/attachments.rc
@@ -1,2 +1,3 @@
 set mime_forward=yes
 set mime_forward_rest=yes
+# vi: ft=muttrc
diff --git a/.config/mutt/color.rc b/.config/mutt/color.rc
index b413dca..180f9a6 100644
--- a/.config/mutt/color.rc
+++ b/.config/mutt/color.rc
@@ -82,3 +82,4 @@ color markers brightcyan default
 mono bold bold
 mono underline underline
 mono indicator reverse
+# vi: ft=muttrc
diff --git a/.config/mutt/dave@sleepmap.de.rc b/.config/mutt/dave@sleepmap.de.rc
index 7d66fb5..4bf523e 100644
--- a/.config/mutt/dave@sleepmap.de.rc
+++ b/.config/mutt/dave@sleepmap.de.rc
@@ -6,7 +6,7 @@ set postponed = "+Drafts"
 set record = "+Sent"
 set realname = "David Runge"
 set signature = ".config/mutt/dave@sleepmap.de.sig"
-set pgp_default_key = '1793DAD5D803A8FFD7451697BB992F9864FAD168'
+set pgp_default_key = "1793DAD5D803A8FFD7451697BB992F9864FAD168"
 
 color status green default
-
+# vi: ft=muttrc
diff --git a/.config/mutt/default.rc b/.config/mutt/default.rc
index 48156bd..5cde967 100644
--- a/.config/mutt/default.rc
+++ b/.config/mutt/default.rc
@@ -1,4 +1,4 @@
-set editor=`echo \$EDITOR`
+set editor = `echo \$EDITOR`
 set folder = "~/.mail"
 set mbox_type = Maildir
 
@@ -9,3 +9,4 @@ set send_charset="utf-8"
 
 auto_view text/html                                      # view html automatically
 alternative_order text/plain text/enriched text/html     # save html for last
+# vi: ft=muttrc
diff --git a/.config/mutt/dvzrv@archlinux.org.rc b/.config/mutt/dvzrv@archlinux.org.rc
index 0a67155..fa5d36c 100644
--- a/.config/mutt/dvzrv@archlinux.org.rc
+++ b/.config/mutt/dvzrv@archlinux.org.rc
@@ -6,7 +6,7 @@ set postponed = "+Drafts"
 set record = "+Sent"
 set realname = "David Runge"
 set signature = ".config/mutt/dvzrv@archlinux.org.sig"
-set pgp_default_key = '991F6E3F0765CF6295888586139B09DA5BF0D338'
+set pgp_default_key = "991F6E3F0765CF6295888586139B09DA5BF0D338"
 
 color status green default
-
+# vi: ft=muttrc
diff --git a/.config/mutt/gpg.rc b/.config/mutt/gpg.rc
index 0e67f41..057cadf 100644
--- a/.config/mutt/gpg.rc
+++ b/.config/mutt/gpg.rc
@@ -1,7 +1,7 @@
 set pgp_good_sign="^gpg: Good signature from "
 set pgp_use_gpg_agent = yes
 set pgp_self_encrypt = yes
-set pgp_default_key = '1793DAD5D803A8FFD7451697BB992F9864FAD168'
+set pgp_default_key = "1793DAD5D803A8FFD7451697BB992F9864FAD168"
 set pgp_timeout = 60
 set pgp_verify_command = "gpg --batch --output - --verify %s %f"
 set crypt_use_gpgme = yes
@@ -14,4 +14,5 @@ set crypt_protected_headers_write = yes
 message-hook '!(~g|~G) ~b"^-----BEGIN\ PGP\ (SIGNED\ )?MESSAGE"' "exec check-traditional-pgp"
 
 send-hook . 'reset crypt_autoencrypt'
-source ".config/mutt/gpg-auto.rc"
+source "~/.config/mutt/gpg-auto.rc"
+# vi: ft=muttrc
diff --git a/.config/mutt/khard.rc b/.config/mutt/khard.rc
index 12c9b39..34cda34 100644
--- a/.config/mutt/khard.rc
+++ b/.config/mutt/khard.rc
@@ -2,4 +2,4 @@
 set query_command= "khard email -p -s last_name -d first_name %s"
 bind editor <Tab> complete-query
 bind editor ^T    complete
-
+# vi: ft=muttrc
diff --git a/.config/mutt/macros.rc b/.config/mutt/macros.rc
index f553665..387d7e3 100644
--- a/.config/mutt/macros.rc
+++ b/.config/mutt/macros.rc
@@ -1,4 +1,3 @@
-
 # source folder settings and enter folder
 macro index,pager <F2> '<sync-mailbox><enter-command>source .config/mutt/dave@sleepmap.de.rc<enter><change-folder>!<enter>'
 macro index,pager <F3> '<sync-mailbox><enter-command>source .config/mutt/dvzrv@archlinux.org.rc<enter><change-folder>!<enter>'
@@ -47,3 +46,4 @@ macro index <F6> \
   <enter-command>set pipe_decode=\$my_old_pipe_decode wait_key=\$my_old_wait_key<enter>" \
   "notmuch: remove message from inbox"
 
+# vi: ft=muttrc
diff --git a/.config/mutt/mediation-team@archlinux.org.rc b/.config/mutt/mediation-team@archlinux.org.rc
new file mode 100644
index 0000000..1c4018b
--- /dev/null
+++ b/.config/mutt/mediation-team@archlinux.org.rc
@@ -0,0 +1,12 @@
+set from = "Mediation Team <mediation-team@archlinux.org>"
+set sendmail  = "/usr/bin/msmtp -a mediation-team@archlinux.org"
+set folder = "~/.mail/mediation-team@archlinux.org"
+set spoolfile = "+INBOX"
+set postponed = "+Drafts"
+set record = "+Sent"
+set realname = "David Runge"
+set signature = ".config/mutt/mediation-team@archlinux.org.sig"
+set pgp_default_key = "18AB3917A2E7EB5B2C551A663139A8CFAE018BC4"
+
+color status green default
+# vi: ft=muttrc
diff --git a/.config/mutt/mediation-team@archlinux.org.sig b/.config/mutt/mediation-team@archlinux.org.sig
new file mode 100644
index 0000000..23af390
--- /dev/null
+++ b/.config/mutt/mediation-team@archlinux.org.sig
@@ -0,0 +1 @@
+https://archlinux.org
diff --git a/.config/mutt/muttrc b/.config/mutt/muttrc
index 4678944..7c400ca 100644
--- a/.config/mutt/muttrc
+++ b/.config/mutt/muttrc
@@ -1,32 +1,33 @@
 # defaults
-source ".config/mutt/default.rc"
+source "~/.config/mutt/default.rc"
 
 # color
-source ".config/mutt/color.rc"
+source "~/.config/mutt/color.rc"
 
 # gnupg
-source ".config/mutt/gpg.rc"
+source "~/.config/mutt/gpg.rc"
 
 # mailboxes (set by offlineimap)
-source ".config/mutt/mailboxes.rc"
+source "~/.config/mutt/mailboxes.rc"
 
 # sorting
-source ".config/mutt/sorting.rc"
+source "~/.config/mutt/sorting.rc"
 
 # attachments
-source ".config/mutt/attachments.rc"
+source "~/.config/mutt/attachments.rc"
 
 # khard (contacts)
-source ".config/mutt/khard.rc"
+source "~/.config/mutt/khard.rc"
 
 # accounts
-source ".config/mutt/accounts.rc"
+source "~/.config/mutt/accounts.rc"
 
 # macros
-source ".config/mutt/macros.rc"
+source "~/.config/mutt/macros.rc"
 
 # security
-source ".config/mutt/security.rc"
+source "~/.config/mutt/security.rc"
 
 # sidebar
-source ".config/mutt/sidebar.rc"
+source "~/.config/mutt/sidebar.rc"
+# vi: ft=muttrc
diff --git a/.config/mutt/security.rc b/.config/mutt/security.rc
index af00478..4fcbdea 100644
--- a/.config/mutt/security.rc
+++ b/.config/mutt/security.rc
@@ -1,2 +1,3 @@
 # disable enter-command (so password commands won't show up in command history)
 bind generic,alias,attach,browser,editor,index,compose,pager,pgp,postpone ':' noop
+# vi: ft=muttrc
diff --git a/.config/mutt/sidebar.rc b/.config/mutt/sidebar.rc
index c3c130c..ac12b7e 100644
--- a/.config/mutt/sidebar.rc
+++ b/.config/mutt/sidebar.rc
@@ -12,3 +12,4 @@ macro pager b '<enter-command>toggle sidebar_visible<enter><redraw-screen>'
 bind index,pager \CP sidebar-prev
 bind index,pager \CN sidebar-next
 bind index,pager \CO sidebar-open
+# vi: ft=muttrc
diff --git a/.config/mutt/sorting.rc b/.config/mutt/sorting.rc
index 48827f7..008220f 100644
--- a/.config/mutt/sorting.rc
+++ b/.config/mutt/sorting.rc
@@ -1,2 +1,3 @@
 set sort = "threads"
 set sort_aux = "last-date-received"
+# vi: ft=muttrc