From f1e9d4186e06a223a030179e152d4788ba10343f Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Fri, 16 Oct 2020 18:00:22 +0100 Subject: Add email configuration for ENPC --- mbsync/.mbsyncrc | 67 ++++++++++++++++++++++++++++++++++------------ msmtp/.msmtprc | 7 +++++ mutt/.gitignore | 1 + mutt/.mutt/id_enpc | 19 +++++++++++++ mutt/.mutt/id_imperial | 15 +++++++++++ mutt/.mutt/id_work | 15 ----------- mutt/.mutt/mailboxes | 2 +- mutt/.mutt/muttrc | 9 ++++--- vim/.gitignore | 2 +- vim/.vim/autoload/.gitkeep | 0 vim/.vim/plugin/.gitkeep | 0 11 files changed, 100 insertions(+), 37 deletions(-) create mode 100644 mutt/.mutt/id_enpc create mode 100644 mutt/.mutt/id_imperial delete mode 100644 mutt/.mutt/id_work create mode 100644 vim/.vim/autoload/.gitkeep create mode 100644 vim/.vim/plugin/.gitkeep diff --git a/mbsync/.mbsyncrc b/mbsync/.mbsyncrc index f41aa8a..d7607fc 100644 --- a/mbsync/.mbsyncrc +++ b/mbsync/.mbsyncrc @@ -3,7 +3,14 @@ Expunge Both SyncState * Sync All -IMAPAccount Work +IMAPAccount Enpc +Host messagerie.enpc.fr +User urbain.vaes@enpc.fr +PassCmd "gpg2 -q --for-your-eyes-only --no-tty -d ~/.password-store/email/urbain.vaes@enpc.fr.gpg" +SSLType IMAPS +CertificateFile /etc/ssl/certs/ca-certificates.crt + +IMAPAccount Imperial Host outlook.office365.com User uv113@ic.ac.uk PassCmd "gpg2 -q --for-your-eyes-only --no-tty -d ~/.password-store/email/u.vaes13@imperial.ac.uk.gpg" @@ -17,14 +24,20 @@ PassCmd "gpg2 -q --for-your-eyes-only --no-tty -d ~/.password-store/email/urbain SSLType IMAPS CertificateFile /etc/ssl/certs/ca-certificates.crt -IMAPStore Work-remote -Account Work +IMAPStore Enpc-remote +Account Enpc + +IMAPStore Imperial-remote +Account Imperial IMAPStore Personal-remote Account Personal -MaildirStore Work-local -Path ~/.mail/Work/ +MaildirStore Enpc-local +Path ~/.mail/Enpc/ + +MaildirStore Imperial-local +Path ~/.mail/Imperial/ MaildirStore Personal-local Path ~/.mail/Personal/ @@ -32,21 +45,41 @@ Path ~/.mail/Personal/ MaildirStore Misc-local Path ~/.mail/Misc/ -Channel Work-inbox -Master :Work-remote:"INBOX" -Slave :Work-local:"Work" +Channel Enpc-inbox +Master :Enpc-remote:"INBOX" +Slave :Enpc-local:"Enpc" + +Channel Enpc-draft +Master :Enpc-remote:"Drafts" +Slave :Enpc-local:"Enpc.drafts" + +Channel Enpc-sent +Master :Enpc-remote:"Sent" +Slave :Enpc-local:"Enpc.sent" + +Channel Enpc-bin +Master :Enpc-remote:"Trash" +Slave :Enpc-local:"Enpc.bin" + +Channel Enpc-archive +Master :Enpc-remote:"Archive" +Slave :Enpc-local:"Enpc.archive" + +Channel Imperial-inbox +Master :Imperial-remote:"INBOX" +Slave :Imperial-local:"Imperial" -Channel Work-draft -Master :Work-remote:"Drafts" -Slave :Work-local:"Work.drafts" +Channel Imperial-draft +Master :Imperial-remote:"Drafts" +Slave :Imperial-local:"Imperial.drafts" -Channel Work-sent -Master :Work-remote:"Sent Items" -Slave :Work-local:"Work.sent" +Channel Imperial-sent +Master :Imperial-remote:"Sent Items" +Slave :Imperial-local:"Imperial.sent" -Channel Work-bin -Master :Work-remote:"Deleted Items" -Slave :Work-local:"Work.bin" +Channel Imperial-bin +Master :Imperial-remote:"Deleted Items" +Slave :Imperial-local:"Imperial.bin" Channel Personal-inbox Master :Personal-remote:"INBOX" diff --git a/msmtp/.msmtprc b/msmtp/.msmtprc index 2e2e036..be9bc55 100644 --- a/msmtp/.msmtprc +++ b/msmtp/.msmtprc @@ -4,6 +4,13 @@ tls on tls_trust_file /etc/ssl/certs/ca-certificates.crt logfile ~/.msmtp.log +account enpc +host boyer1.enpc.fr +from urbain.vaes@enpc.fr +user urbain.vaes@enpc.fr +passwordeval "gpg --use-agent --quiet --for-your-eyes-only --no-tty --decrypt ~/.password-store/email/urbain.vaes@enpc.fr.gpg" +port 587 + account imperial host outlook.office365.com from u.vaes13@imperial.ac.uk diff --git a/mutt/.gitignore b/mutt/.gitignore index f2abc1a..aec4501 100644 --- a/mutt/.gitignore +++ b/mutt/.gitignore @@ -1,3 +1,4 @@ +.mail/Enpc/* .mail/Work/* .mail/Personal/* .mail/Misc/* diff --git a/mutt/.mutt/id_enpc b/mutt/.mutt/id_enpc new file mode 100644 index 0000000..82bca7d --- /dev/null +++ b/mutt/.mutt/id_enpc @@ -0,0 +1,19 @@ +set from = "urbain.vaes@enpc.fr" +set sendmail="/usr/bin/msmtp -a enpc" + +set spoolfile = "+Enpc/Enpc" +set postponed = "+Enpc/Enpc.drafts" +set trash = "+Enpc/Enpc.bin" + +# Record not necessary because outlook saves messages +unset record + +macro index,pager gs " +Enpc/Enpc.sent" +macro index,pager gd " $postponed" +macro index,pager gb " $trash" +macro index,pager ga " +Enpc/Enpc.archive" +macro index,pager s "=Enpc/Enpc.archive" + +folder-hook 'Enpc*' 'source ~/.mutt/id_enpc' +# vim: ft=muttrc + diff --git a/mutt/.mutt/id_imperial b/mutt/.mutt/id_imperial new file mode 100644 index 0000000..ed7aeb2 --- /dev/null +++ b/mutt/.mutt/id_imperial @@ -0,0 +1,15 @@ +set from = "u.vaes13@imperial.ac.uk" +set sendmail="/usr/bin/msmtp -a imperial" + +set spoolfile = "+Imperial/Imperial" +set postponed = "+Imperial/Imperial.drafts" +set trash = "+Imperial/Imperial.bin" + +# Record not necessary because outlook saves messages +unset record + +macro index,pager gs " +Imperial/Imperial.sent" +macro index,pager gd " $postponed" +macro index,pager gb " $trash" + +# vim: ft=muttrc diff --git a/mutt/.mutt/id_work b/mutt/.mutt/id_work deleted file mode 100644 index ac75a03..0000000 --- a/mutt/.mutt/id_work +++ /dev/null @@ -1,15 +0,0 @@ -set from = "u.vaes13@imperial.ac.uk" -set sendmail="/usr/bin/msmtp -a imperial" - -set spoolfile = "+Work/Work" -set postponed = "+Work/Work.drafts" -set trash = "+Work/Work.bin" - -# Record not necessary because outlook saves messages -unset record - -macro index,pager gs " +Work/Work.sent" -macro index,pager gd " $postponed" -macro index,pager gb " $trash" - -# vim: ft=muttrc diff --git a/mutt/.mutt/mailboxes b/mutt/.mutt/mailboxes index 96bf701..9abd94f 100644 --- a/mutt/.mutt/mailboxes +++ b/mutt/.mutt/mailboxes @@ -1 +1 @@ -mailboxes "+Work/Work" "+Work/Work.bin" "+Work/Work.drafts" "+Work/Work.sent" "+Personal/Personal" "+Personal/Personal.bin" "+Personal/Personal.drafts" "+Personal/Personal.sent" "+Misc/rss" "+Misc/lists" +mailboxes "+Enpc/Enpc" "+Enpc/Enpc.bin" "+Enpc/Enpc.drafts" "+Enpc/Enpc.sent" "+Enpc/Enpc.archive" "+Imperial/Imperial" "+Imperial/Imperial.bin" "+Imperial/Imperial.drafts" "+Imperial/Imperial.sent" "+Personal/Personal" "+Personal/Personal.bin" "+Personal/Personal.drafts" "+Personal/Personal.sent" "+Misc/rss" "+Misc/lists" diff --git a/mutt/.mutt/muttrc b/mutt/.mutt/muttrc index 7ad8cbf..a75c088 100644 --- a/mutt/.mutt/muttrc +++ b/mutt/.mutt/muttrc @@ -13,7 +13,7 @@ source `FILE=$HOME/.mutt/colors/$COLORSCHEME.muttrc; if [ ! -s "$FILE" ]; then F source ~/.mutt/crypto source ~/.mutt/alias source ~/.mutt/mailboxes -source ~/.mutt/id_work +source ~/.mutt/id_enpc # General set realname = "Urbain Vaes" @@ -51,6 +51,7 @@ bind index,pager O sidebar-open # Prompts set delete = yes set quit = yes +set confirmappend = no # Pager set pager_stop @@ -69,7 +70,8 @@ set index_format="%X %Z %{%b %d} %-15.15L (%?l?%4l&%4c?) %s" # Macros macro index,pager gp " +Personal/Personal" -macro index,pager gw " +Work/Work" +macro index,pager gi " +Imperial/Imperial" +macro index,pager gw " +Enpc/Enpc" macro pager u "urlview\n" # Key bindings @@ -92,7 +94,8 @@ bind pager R group-reply macro compose \CA "!mutt_attach\n" # Hooks -folder-hook 'Work*' 'source ~/.mutt/id_work' +folder-hook 'Enpc*' 'source ~/.mutt/id_enpc' +folder-hook 'Imperial*' 'source ~/.mutt/id_imperial' folder-hook 'Personal*' 'source ~/.mutt/id_personal' macro index,pager gr " +Misc/rss" diff --git a/vim/.gitignore b/vim/.gitignore index f962736..34ef01f 100644 --- a/vim/.gitignore +++ b/vim/.gitignore @@ -1,2 +1,2 @@ -.vim/autoload +.vim/autoload/plug.vim .vim/vim-plug diff --git a/vim/.vim/autoload/.gitkeep b/vim/.vim/autoload/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/vim/.vim/plugin/.gitkeep b/vim/.vim/plugin/.gitkeep new file mode 100644 index 0000000..e69de29 -- cgit v1.2.3