From db0ee4da1d393dd826b0686b7404e410fd21181b Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Mon, 2 Nov 2020 13:41:42 +0000 Subject: Add Inria email --- mbsync/.mbsyncrc | 62 +++++++++++++++++++++------------------- msmtp/.msmtprc | 7 +++++ mutt/.mail/Inria/.gitkeep | 0 mutt/.mutt/id_enpc | 3 ++ mutt/.mutt/id_imperial | 18 ++++++------ mutt/.mutt/id_inria | 17 +++++++++++ mutt/.mutt/mailboxes | 2 +- mutt/.mutt/muttrc | 8 ++++-- vim/.vim/spell/en.utf-8.add | 2 ++ vim/.vim/spell/en.utf-8.add.spl | Bin 1138 -> 1164 bytes vim/.vimrc | 4 +-- 11 files changed, 78 insertions(+), 45 deletions(-) create mode 100644 mutt/.mail/Inria/.gitkeep create mode 100644 mutt/.mutt/id_inria diff --git a/mbsync/.mbsyncrc b/mbsync/.mbsyncrc index d7607fc..6654750 100644 --- a/mbsync/.mbsyncrc +++ b/mbsync/.mbsyncrc @@ -3,6 +3,13 @@ Expunge Both SyncState * Sync All +IMAPAccount Inria +Host zimbra.inria.fr +User urbain.vaes@inria.fr +PassCmd "gpg2 -q --for-your-eyes-only --no-tty -d ~/.password-store/email/urbain.vaes@inria.fr.gpg" +SSLType IMAPS +CertificateFile /etc/ssl/certs/ca-certificates.crt + IMAPAccount Enpc Host messagerie.enpc.fr User urbain.vaes@enpc.fr @@ -10,13 +17,6 @@ PassCmd "gpg2 -q --for-your-eyes-only --no-tty -d ~/.password-store/email/urbain 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" -SSLType IMAPS -CertificateFile /etc/ssl/certs/ca-certificates.crt - IMAPAccount Personal Host mail.gandi.net User urbain@vaes.uk @@ -24,27 +24,47 @@ PassCmd "gpg2 -q --for-your-eyes-only --no-tty -d ~/.password-store/email/urbain SSLType IMAPS CertificateFile /etc/ssl/certs/ca-certificates.crt +IMAPStore Inria-remote +Account Inria + IMAPStore Enpc-remote Account Enpc -IMAPStore Imperial-remote -Account Imperial - IMAPStore Personal-remote Account Personal +MaildirStore Inria-local +Path ~/.mail/Inria/ + MaildirStore Enpc-local Path ~/.mail/Enpc/ -MaildirStore Imperial-local -Path ~/.mail/Imperial/ - MaildirStore Personal-local Path ~/.mail/Personal/ MaildirStore Misc-local Path ~/.mail/Misc/ +Channel Inria-inbox +Master :Inria-remote:"INBOX" +Slave :Inria-local:"Inria" + +Channel Inria-draft +Master :Inria-remote:"Drafts" +Slave :Inria-local:"Inria.drafts" + +Channel Inria-sent +Master :Inria-remote:"Sent" +Slave :Inria-local:"Inria.sent" + +Channel Inria-bin +Master :Inria-remote:"Trash" +Slave :Inria-local:"Inria.bin" + +Channel Inria-archive +Master :Inria-remote:"Archive" +Slave :Inria-local:"Inria.archive" + Channel Enpc-inbox Master :Enpc-remote:"INBOX" Slave :Enpc-local:"Enpc" @@ -65,22 +85,6 @@ Channel Enpc-archive Master :Enpc-remote:"Archive" Slave :Enpc-local:"Enpc.archive" -Channel Imperial-inbox -Master :Imperial-remote:"INBOX" -Slave :Imperial-local:"Imperial" - -Channel Imperial-draft -Master :Imperial-remote:"Drafts" -Slave :Imperial-local:"Imperial.drafts" - -Channel Imperial-sent -Master :Imperial-remote:"Sent Items" -Slave :Imperial-local:"Imperial.sent" - -Channel Imperial-bin -Master :Imperial-remote:"Deleted Items" -Slave :Imperial-local:"Imperial.bin" - Channel Personal-inbox Master :Personal-remote:"INBOX" Slave :Personal-local:"Personal" diff --git a/msmtp/.msmtprc b/msmtp/.msmtprc index be9bc55..f3a2cb0 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 inria +host smtp.inria.fr +from urbain.vaes@inria.fr +user uvaes +passwordeval "gpg --use-agent --quiet --for-your-eyes-only --no-tty --decrypt ~/.password-store/email/urbain.vaes@inria.fr.gpg" +port 587 + account enpc host boyer1.enpc.fr from urbain.vaes@enpc.fr diff --git a/mutt/.mail/Inria/.gitkeep b/mutt/.mail/Inria/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/mutt/.mutt/id_enpc b/mutt/.mutt/id_enpc index ff947fe..bf5451b 100644 --- a/mutt/.mutt/id_enpc +++ b/mutt/.mutt/id_enpc @@ -6,6 +6,9 @@ set record = "+Enpc/Enpc.sent" 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" diff --git a/mutt/.mutt/id_imperial b/mutt/.mutt/id_imperial index ed7aeb2..ca35257 100644 --- a/mutt/.mutt/id_imperial +++ b/mutt/.mutt/id_imperial @@ -1,15 +1,13 @@ -set from = "u.vaes13@imperial.ac.uk" -set sendmail="/usr/bin/msmtp -a imperial" +set from = "urbain.vaes@enpc.fr" +set sendmail="/usr/bin/msmtp -a enpc" -set spoolfile = "+Imperial/Imperial" -set postponed = "+Imperial/Imperial.drafts" -set trash = "+Imperial/Imperial.bin" - -# Record not necessary because outlook saves messages -unset record +set spoolfile = "+Enpc/Enpc" +set record = "+Enpc/Enpc.sent" +set postponed = "+Enpc/Enpc.drafts" +set trash = "+Enpc/Enpc.bin" macro index,pager gs " +Imperial/Imperial.sent" -macro index,pager gd " $postponed" -macro index,pager gb " $trash" +macro index,pager gd " +Imperial/Imperial.drafts" +macro index,pager gb " +Imperial/Imperial.bin" # vim: ft=muttrc diff --git a/mutt/.mutt/id_inria b/mutt/.mutt/id_inria new file mode 100644 index 0000000..af52357 --- /dev/null +++ b/mutt/.mutt/id_inria @@ -0,0 +1,17 @@ +set from = "urbain.vaes@inria.fr" +set sendmail="/usr/bin/msmtp -a inria" + +set spoolfile = "+Inria/Inria" +set record = "+Inria/Inria.sent" +set postponed = "+Inria/Inria.drafts" +set trash = "+Inria/Inria.bin" + +macro index,pager gs " +Inria/Inria.sent" +macro index,pager gd " $postponed" +macro index,pager gb " $trash" +macro index,pager ga " +Inria/Inria.archive" +macro index,pager a "=Inria/Inria.archive" + +# vim: ft=muttrc + + diff --git a/mutt/.mutt/mailboxes b/mutt/.mutt/mailboxes index 9abd94f..961ce3b 100644 --- a/mutt/.mutt/mailboxes +++ b/mutt/.mutt/mailboxes @@ -1 +1 @@ -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" +mailboxes "+Inria/Inria" "+Inria/Inria.bin" "+Inria/Inria.drafts" "+Inria/Inria.sent" "+Inria/Inria.archive" "+Enpc/Enpc" "+Enpc/Enpc.bin" "+Enpc/Enpc.drafts" "+Enpc/Enpc.sent" "+Enpc/Enpc.archive" "+Personal/Personal" "+Personal/Personal.bin" "+Personal/Personal.drafts" "+Personal/Personal.sent" "+Imperial/Imperial" "+Imperial/Imperial.bin" "+Imperial/Imperial.drafts" "+Imperial/Imperial.sent" "+Misc/rss" "+Misc/lists" diff --git a/mutt/.mutt/muttrc b/mutt/.mutt/muttrc index 816a564..8092f06 100644 --- a/mutt/.mutt/muttrc +++ b/mutt/.mutt/muttrc @@ -11,7 +11,7 @@ source ~/.mutt/colors.muttrc source ~/.mutt/crypto source ~/.mutt/alias source ~/.mutt/mailboxes -source ~/.mutt/id_enpc +source ~/.mutt/id_inria # General set realname = "Urbain Vaes" @@ -70,8 +70,9 @@ set index_format="%4C %X %Z %{%b %d} %-15.15L (%?l?%4l&%4c?) %s" # Macros macro index,pager gp " +Personal/Personal" -macro index,pager gi " +Imperial/Imperial" macro index,pager ge " +Enpc/Enpc" +macro index,pager gi " +Inria/Inria" +macro index,pager go " +Imperial/Imperial" macro pager u "urlview\n" # Key bindings @@ -95,10 +96,11 @@ bind pager R group-reply macro compose \CA "!mutt_attach\n" # Flow text -set text_flowed +# set text_flowed # Bug with this setting '>' instead of '> ' # Hooks folder-hook 'Enpc*' 'source ~/.mutt/id_enpc' +folder-hook 'Inria*' 'source ~/.mutt/id_inria' folder-hook 'Imperial*' 'source ~/.mutt/id_imperial' folder-hook 'Personal*' 'source ~/.mutt/id_personal' diff --git a/vim/.vim/spell/en.utf-8.add b/vim/.vim/spell/en.utf-8.add index dbb52c2..f83eb5d 100644 --- a/vim/.vim/spell/en.utf-8.add +++ b/vim/.vim/spell/en.utf-8.add @@ -70,3 +70,5 @@ minorization perturbative documentclass preconditioner +subfolder +postdoc diff --git a/vim/.vim/spell/en.utf-8.add.spl b/vim/.vim/spell/en.utf-8.add.spl index c1471ca..e527841 100644 Binary files a/vim/.vim/spell/en.utf-8.add.spl and b/vim/.vim/spell/en.utf-8.add.spl differ diff --git a/vim/.vimrc b/vim/.vimrc index e2ffadb..b4f98ed 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -24,12 +24,12 @@ Plug 'junegunn/goyo.vim' Plug 'junegunn/gv.vim' Plug 'junegunn/heytmux' Plug 'junegunn/vim-easy-align' -Plug 'junegunn/vim-peekaboo' +" Plug 'junegunn/vim-peekaboo' Plug 'junegunn/vim-slash' Plug 'justinmk/vim-dirvish' Plug 'justinmk/vim-sneak' Plug 'kshenoy/vim-signature' -Plug 'lervag/vimtex', {'commit': '8287981'} +Plug 'lervag/vimtex' Plug 'machakann/vim-highlightedyank' Plug 'majutsushi/tagbar' Plug 'mg979/vim-visual-multi' -- cgit v1.2.3