Update mail configuration

9 files changed, 50 insertions, 27 deletions

diff --git a/.mutt/id_gmail b/.mutt/id_gmail
deleted file mode 100644
index af1f334..0000000
--- a/.mutt/id_gmail
+++ /dev/null
@@ -1,2 +0,0 @@
-set from = "urbain.p.vaes@gmail.com"
-set sendmail="/usr/bin/msmtp -a gmail"
diff --git a/.mutt/id_imperial b/.mutt/id_imperial
index e4df7f5..55311a4 100644
--- a/.mutt/id_imperial
+++ b/.mutt/id_imperial
@@ -1,2 +1,7 @@
 set from = "u.vaes13@imperial.ac.uk"
 set sendmail="/usr/bin/msmtp -a imperial"
+
+set spoolfile = "+Imperial/Imperial"
+set record    = "+Imperial/Imperial.sent"
+set postponed = "+Imperial/Imperial.drafts"
+set trash     = "+Imperial/Imperial.bin"
diff --git a/.mutt/id_informal b/.mutt/id_informal
new file mode 100644
index 0000000..41e5ed7
--- /dev/null
+++ b/.mutt/id_informal
@@ -0,0 +1,7 @@
+set from = "urbainvaes90@gmail.com"
+set sendmail="/usr/bin/msmtp -a informal"
+
+set spoolfile = "+Informal/Informal"
+set record    = "+Informal/Informal.sent"
+set postponed = "+Informal/Informal.drafts"
+set trash     = "+Informal/Informal.bin"
diff --git a/.mutt/id_main b/.mutt/id_main
new file mode 100644
index 0000000..9e854bc
--- /dev/null
+++ b/.mutt/id_main
@@ -0,0 +1,7 @@
+set from = "urbain.p.vaes@gmail.com"
+set sendmail="/usr/bin/msmtp -a main"
+
+set spoolfile = "+Main/Main"
+set record    = "+Main/Main.sent"
+set postponed = "+Main/Main.drafts"
+set trash     = "+Main/Main.bin"
diff --git a/.mutt/id_openmailbox b/.mutt/id_openmailbox
deleted file mode 100644
index 99518a1..0000000
--- a/.mutt/id_openmailbox
+++ /dev/null
@@ -1,2 +0,0 @@
-set from = "urbain.p.vaes@openmailbox.org"
-set sendmail="/usr/bin/msmtp -a openmailbox"
diff --git a/.mutt/id_private b/.mutt/id_private
new file mode 100644
index 0000000..74bf064
--- /dev/null
+++ b/.mutt/id_private
@@ -0,0 +1,7 @@
+set from = "urbain.p.vaes@openmailbox.org"
+set sendmail="/usr/bin/msmtp -a private"
+
+set spoolfile = "+Private/Private"
+set record    = "+Private/Private.sent"
+set postponed = "+Private/Private.drafts"
+set trash     = "+Private/Private.bin"
diff --git a/.mutt/mailboxes b/.mutt/mailboxes
index 53a640f..5fda20c 100644
--- a/.mutt/mailboxes
+++ b/.mutt/mailboxes
@@ -1 +1 @@
-mailboxes "+openmailbox/Free" "+Main/Main" "+Gmail/Gmail" "+Imperial/Imperial" "+Main/Sent" "+Main/Drafts" "+Main/Bin"
+mailboxes "+Imperial/Imperial" "+Imperial/Imperial.bin" "+Imperial/Imperial.drafts" "+Imperial/Imperial.sent" "+Informal/Informal" "+Informal/Informal.bin" "+Informal/Informal.drafts" "+Informal/Informal.sent" "+Main/Main" "+Main/Main.bin" "+Main/Main.drafts" "+Main/Main.sent" "+Private/Private" "+Private/Private.bin" "+Private/Private.drafts" "+Private/Private.sent"
diff --git a/.mutt/muttrc b/.mutt/muttrc
index 3918c3a..d9f1bc8 100644
--- a/.mutt/muttrc
+++ b/.mutt/muttrc
@@ -12,11 +12,14 @@ set tmpdir           = ~/.mutt/temp
 source ~/.mutt/crypto
 source ~/.mutt/alias
 source ~/.mutt/mailboxes
+source ~/.mutt/id_main
 
 # General information
-set from = "urbain.p.vaes@gmail.com"
 set realname = "Urbain Vaes"
+set reverse_alias
+set sort = reverse-date
 set weed
+unset markers
 
 # Encryption
 set crypt_autosign = no
@@ -27,13 +30,6 @@ set pgp_sign_as = 716064C0
 set pgp_use_gpg_agent = yes
 set pgp_timeout = 3600
 
-
-# Maildirs
-set spoolfile = "+Main/Main"
-set record    = "+Main/Sent"
-set postponed = "+Main/Drafts"
-set trash = "+Main/Bin"
-
 # Sidebar
 set sidebar_width=26
 set sidebar_visible = yes
@@ -50,11 +46,6 @@ set quit = yes
 set pager_stop
 set pager_index_lines = 10
 
-# Misc
-unset markers
-set reverse_alias
-set sort = reverse-date
-
 # HTML messages
 auto_view text/html
 alternative_order text/plain text/enriched text/html
@@ -63,13 +54,21 @@ alternative_order text/plain text/enriched text/html
 set editor="vim --noplugin"
 set include=yes
 
-# Program to send mails
-set sendmail="/usr/bin/msmtp"
+# Macros
+macro index gm "<change-folder> +Main/Main<enter>" 
+macro index gp "<change-folder> +Private/Private<enter>" 
+macro index gi "<change-folder> +Informal/Informal<enter>" 
+macro index gw "<change-folder> +Imperial/Imperial<enter>" 
 
+macro index gs "<change-folder> $record<enter>" 
+macro index gd "<change-folder> $postponed<enter>" 
+macro index gb "<change-folder> $trash<enter>"
 
 # Key bindings
 bind index,pager \Cf next-page
 bind index,pager \Cb previous-page
+bind index,pager \Cu next-unread-mailbox
+
 bind index gg first-entry
 bind index G last-entry
 bind index i flag-message
@@ -80,13 +79,16 @@ bind pager j next-entry
 bind pager k previous-entry
 bind pager R group-reply
 
+# Hooks
+send-hook '~t .*@imperial\.ac\.uk$' 'source ~/.mutt/id_imperial'
+reply-hook '~t .*@imperial\.ac\.uk$' 'source ~/.mutt/id_imperial'
+
+folder-hook 'Main*'    'source ~/.mutt/id_main'
+folder-hook 'Informal*' 'source ~/.mutt/id_informal'
+folder-hook 'Private*'  'source ~/.mutt/id_private'
+folder-hook 'Imperial*' 'source ~/.mutt/id_imperial'
+
 # Source mutt solarized
 `[ "$COLORSCHEME" = "light" ] && echo source $HOME/.mutt/solarized/mutt-colors-solarized-light-16.muttrc || echo set`
 `[ "$COLORSCHEME" = "dark" ] && echo source $HOME/.mutt/solarized/mutt-colors-solarized-dark-16.muttrc || echo set`
 `[ "$COLORSCHEME" = "default" ] && echo source $HOME/.mutt/solarized/mutt-colors-solarized-dark-16.muttrc || echo set`
-
-# Hooks
-reply-hook . 'source ~/.mutt/id_gmail'
-send-hook . 'source ~/.mutt/id_gmail'
-send-hook '~t .*@imperial\.ac\.uk$' 'source ~/.mutt/id_imperial'
-reply-hook '~t .*@imperial\.ac\.uk$' 'source ~/.mutt/id_imperial'
diff --git a/.mutt/signature b/.mutt/signature
index 1b04db1..eb52bfb 100644
--- a/.mutt/signature
+++ b/.mutt/signature
@@ -1,2 +1 @@
 Urbain Vaes
-urbain.p.vaes@gmail.com