Merge branch 'master' of urbainvaes.com:git/dotfiles

5 files changed, 6 insertions, 37 deletions

diff --git a/.mutt/id_informal b/.mutt/id_informal
deleted file mode 100644
index 0383212..0000000
--- a/.mutt/id_informal
+++ /dev/null
@@ -1,13 +0,0 @@
-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"
-
-macro index,pager gs "<change-folder> $record<enter>"
-macro index,pager gd "<change-folder> $postponed<enter>"
-macro index,pager gb "<change-folder> $trash<enter>"
-
-unset record
diff --git a/.mutt/id_main b/.mutt/id_main
deleted file mode 100644
index 72dd460..0000000
--- a/.mutt/id_main
+++ /dev/null
@@ -1,13 +0,0 @@
-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"
-
-macro index,pager gs "<change-folder> $record<enter>"
-macro index,pager gd "<change-folder> $postponed<enter>"
-macro index,pager gb "<change-folder> $trash<enter>"
-
-unset record
diff --git a/.mutt/id_personal b/.mutt/id_personal
index 5449002..96892b3 100644
--- a/.mutt/id_personal
+++ b/.mutt/id_personal
@@ -1,5 +1,5 @@
-set from = "urbain.p.vaes@openmailbox.org"
-set sendmail="/usr/bin/msmtp -a openmailbox"
+set from = "mail@urbainvaes.com"
+set sendmail="/usr/bin/msmtp -a personal"
 
 set spoolfile = "+Personal/Personal"
 set record    = "+Personal/Personal.sent"
diff --git a/.mutt/mailboxes b/.mutt/mailboxes
index 14722ea..a4be3a9 100644
--- a/.mutt/mailboxes
+++ b/.mutt/mailboxes
@@ -1 +1 @@
-mailboxes "+Work/Work" "+Work/Work.bin" "+Work/Work.drafts" "+Work/Work.sent" "+Main/Main" "+Main/Main.bin" "+Main/Main.drafts" "+Main/Main.sent" "+Personal/Personal" "+Personal/Personal.bin" "+Personal/Personal.drafts" "+Personal/Personal.sent" "+Informal/Informal" "+Informal/Informal.bin" "+Informal/Informal.drafts" "+Informal/Informal.sent"
+mailboxes "+Work/Work" "+Work/Work.bin" "+Work/Work.drafts" "+Work/Work.sent" "+Personal/Personal" "+Personal/Personal.bin" "+Personal/Personal.drafts" "+Personal/Personal.sent"
diff --git a/.mutt/muttrc b/.mutt/muttrc
index 5fdc682..d5481fd 100644
--- a/.mutt/muttrc
+++ b/.mutt/muttrc
@@ -35,6 +35,8 @@ set pgp_timeout = 3600
 set sidebar_width=26
 set sidebar_visible = yes
 set sidebar_delim='|'
+set sidebar_shortpath = yes
+set sidebar_folderindent = yes
 bind index,pager \Cn sidebar-next
 bind index,pager \Cp sidebar-prev
 bind index,pager O sidebar-open
@@ -56,9 +58,7 @@ set editor="vim"
 set include=yes
 
 # Macros
-macro index,pager gm "<change-folder> +Main/Main<enter>"
 macro index,pager gp "<change-folder> +Personal/Personal<enter>"
-macro index,pager gi "<change-folder> +Informal/Informal<enter>"
 macro index,pager gw "<change-folder> +Work/Work<enter>"
 
 # Key bindings
@@ -79,13 +79,8 @@ bind pager k previous-entry
 bind pager R group-reply
 
 # Hooks
-# send-hook '~t .*@imperial\.ac\.uk$' 'source ~/.mutt/id_work'
-# reply-hook '~t .*@imperial\.ac\.uk$' 'source ~/.mutt/id_work'
-
-folder-hook 'Main*'     'source ~/.mutt/id_main'
-folder-hook 'Informal*' 'source ~/.mutt/id_informal'
-folder-hook 'Personal*' 'source ~/.mutt/id_personal'
 folder-hook 'Work*'     'source ~/.mutt/id_work'
+folder-hook 'Personal*' 'source ~/.mutt/id_personal'
 
 # Source mutt solarized
 `[ "$COLORSCHEME" = "light" ] && echo source $HOME/.mutt/solarized/mutt-colors-solarized-light-16.muttrc || echo set`