summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.mbsyncrc81
-rw-r--r--.msmtprc26
-rw-r--r--.mutt/id_informal13
-rw-r--r--.mutt/id_main13
-rw-r--r--.mutt/id_personal4
-rw-r--r--.mutt/mailboxes2
-rw-r--r--.mutt/muttrc9
7 files changed, 30 insertions, 118 deletions
diff --git a/.mbsyncrc b/.mbsyncrc
index 9945cdc..0b0637b 100644
--- a/.mbsyncrc
+++ b/.mbsyncrc
@@ -1,20 +1,7 @@
Create Both
Expunge Both
SyncState *
-
-IMAPAccount Main
-Host imap.gmail.com
-User urbain.p.vaes@gmail.com
-PassCmd "gpg2 -q --for-your-eyes-only --no-tty -d ~/.password-store/gmail/urbain.p.vaes@gmail.com.gpg"
-SSLType IMAPS
-CertificateFile /etc/ssl/certs/ca-certificates.crt
-
-IMAPAccount Informal
-Host imap.gmail.com
-User urbainvaes90@gmail.com
-PassCmd "gpg2 -q --for-your-eyes-only --no-tty -d ~/.password-store/gmail/urbainvaes90@gmail.com.gpg"
-SSLType IMAPS
-CertificateFile /etc/ssl/certs/ca-certificates.crt
+Sync All
IMAPAccount Work
Host outlook.office365.com
@@ -24,68 +11,24 @@ SSLType IMAPS
CertificateFile /etc/ssl/certs/ca-certificates.crt
IMAPAccount Personal
-Host imap.openmailbox.org
-User urbain.p.vaes@openmailbox.org
-PassCmd "gpg2 -q --for-your-eyes-only --no-tty -d ~/.password-store/openmailbox/urbain.p.vaes@openmailbox.org.gpg"
+Host box.bknguyen.org
+User me@urbainvaes.com
+PassCmd "gpg2 -q --for-your-eyes-only --no-tty -d ~/.password-store/bknguyen.org/me@uvaes.com.gpg"
SSLType IMAPS
CertificateFile /etc/ssl/certs/ca-certificates.crt
-IMAPStore Main-remote
-Account Main
-
-IMAPStore Informal-remote
-Account Informal
-
IMAPStore Work-remote
Account Work
IMAPStore Personal-remote
Account Personal
-MaildirStore Main-local
-Path ~/.mail/Main/
-
-MaildirStore Informal-local
-Path ~/.mail/Informal/
-
MaildirStore Work-local
Path ~/.mail/Work/
MaildirStore Personal-local
Path ~/.mail/Personal/
-Channel Main-inbox
-Master :Main-remote:"INBOX"
-Slave :Main-local:"Main"
-
-Channel Main-draft
-Master :Main-remote:"[Gmail]/Drafts"
-Slave :Main-local:"Main.drafts"
-
-Channel Main-sent
-Master :Main-remote:"[Gmail]/Sent Mail"
-Slave :Main-local:"Main.sent"
-
-Channel Main-bin
-Master :Main-remote:"[Gmail]/Bin"
-Slave :Main-local:"Main.bin"
-
-Channel Informal-inbox
-Master :Informal-remote:"INBOX"
-Slave :Informal-local:"Informal"
-
-Channel Informal-draft
-Master :Informal-remote:"[Gmail]/Drafts"
-Slave :Informal-local:"Informal.drafts"
-
-Channel Informal-sent
-Master :Informal-remote:"[Gmail]/Sent Mail"
-Slave :Informal-local:"Informal.sent"
-
-Channel Informal-bin
-Master :Informal-remote:"[Gmail]/Bin"
-Slave :Informal-local:"Informal.bin"
-
Channel Work-inbox
Master :Work-remote:"INBOX"
Slave :Work-local:"Work"
@@ -117,3 +60,19 @@ Slave :Personal-local:"Personal.sent"
Channel Personal-bin
Master :Personal-remote:"Trash"
Slave :Personal-local:"Personal.bin"
+
+Channel Personal-accounts
+Master :Personal-remote:"Accounts"
+Slave :Personal-local:"Personal.accounts"
+
+Channel Personal-personal
+Master :Personal-remote:"Personal"
+Slave :Personal-local:"Personal.personal"
+
+Channel Personal-jobs
+Master :Personal-remote:"Jobs"
+Slave :Personal-local:"Personal.jobs"
+
+Channel Personal-archive
+Master :Personal-remote:"Archive"
+Slave :Personal-local:"Personal.archive"
diff --git a/.msmtprc b/.msmtprc
index 565459b..22b5950 100644
--- a/.msmtprc
+++ b/.msmtprc
@@ -4,20 +4,6 @@ tls on
tls_trust_file /etc/ssl/certs/ca-certificates.crt
logfile ~/.msmtp.log
-account main
-host smtp.gmail.com
-port 587
-from urbain.p.vaes@gmail.com
-user urbain.p.vaes
-passwordeval "gpg --use-agent --quiet --for-your-eyes-only --no-tty --decrypt ~/.password-store/gmail/urbain.p.vaes@gmail.com.gpg"
-
-account informal
-host smtp.gmail.com
-port 587
-from urbainvaes90@gmail.com
-user urbainvaes90
-passwordeval "gpg --use-agent --quiet --for-your-eyes-only --no-tty --decrypt ~/.password-store/gmail/urbainvaes90@gmail.com.gpg"
-
account imperial
host outlook.office365.com
from u.vaes13@imperial.ac.uk
@@ -25,11 +11,11 @@ user uv113@ic.ac.uk
passwordeval "gpg --use-agent --quiet --for-your-eyes-only --no-tty --decrypt ~/.password-store/imperial/u.vaes13@imperial.ac.uk.gpg"
port 587
-account openmailbox
-host smtp.openmailbox.org
-from urbain.p.vaes@openmailbox.org
-user urbain.p.vaes@openmailbox.org
-passwordeval "gpg --use-agent --quiet --for-your-eyes-only --no-tty --decrypt ~/.password-store/openmailbox/urbain.p.vaes@openmailbox.org.gpg"
+account personal
+host box.bknguyen.org
+from me@urbainvaes.com
+user me@urbainvaes.com
+passwordeval "gpg --use-agent --quiet --for-your-eyes-only --no-tty --decrypt ~/.password-store/bknguyen.org/me@uvaes.com.gpg"
port 587
-account default : main
+account default : personal
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..a1ff085 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 = "me@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..f69ff63 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" "+Main/Main" "+Main/Main.bin" "+Main/Main.drafts" "+Main/Main.sent" "+Personal/Personal" "+Personal/Personal.personal" "+Personal/Personal.archive" "+Personal/Personal.accounts" "+Personal/Personal.jobs" "+Personal/Personal.bin" "+Personal/Personal.drafts" "+Personal/Personal.sent" "+Informal/Informal" "+Informal/Informal.bin" "+Informal/Informal.drafts" "+Informal/Informal.sent" "+Informal/Informal" "+Informal/Informal.bin" "+Informal/Informal.drafts" "+Informal/Informal.sent"
diff --git a/.mutt/muttrc b/.mutt/muttrc
index 5fdc682..ed8de24 100644
--- a/.mutt/muttrc
+++ b/.mutt/muttrc
@@ -56,9 +56,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 +77,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`