Change names of identities mutt

6 files changed, 37 insertions, 41 deletions

diff --git a/.msmtprc b/.msmtprc
index f1bbecb..565459b 100644
--- a/.msmtprc
+++ b/.msmtprc
@@ -25,7 +25,7 @@ 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        private
+account        openmailbox
 host           smtp.openmailbox.org
 from           urbain.p.vaes@openmailbox.org
 user           urbain.p.vaes@openmailbox.org
diff --git a/.mutt/id_private b/.mutt/id_personal
index b82d298..5449002 100644
--- a/.mutt/id_private
+++ b/.mutt/id_personal
@@ -1,10 +1,10 @@
 set from = "urbain.p.vaes@openmailbox.org"
-set sendmail="/usr/bin/msmtp -a private"
+set sendmail="/usr/bin/msmtp -a openmailbox"
 
-set spoolfile = "+Private/Private"
-set record    = "+Private/Private.sent"
-set postponed = "+Private/Private.drafts"
-set trash     = "+Private/Private.bin"
+set spoolfile = "+Personal/Personal"
+set record    = "+Personal/Personal.sent"
+set postponed = "+Personal/Personal.drafts"
+set trash     = "+Personal/Personal.bin"
 
 macro index,pager gs "<change-folder> $record<enter>"
 macro index,pager gd "<change-folder> $postponed<enter>"
diff --git a/.mutt/id_imperial b/.mutt/id_work
index d4b828d..238cfcb 100644
--- a/.mutt/id_imperial
+++ b/.mutt/id_work
@@ -1,10 +1,10 @@
 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"
+set spoolfile = "+Work/Work"
+set record    = "+Work/Work.sent"
+set postponed = "+Work/Work.drafts"
+set trash     = "+Work/Work.bin"
 
 macro index,pager gs "<change-folder> $record<enter>"
 macro index,pager gd "<change-folder> $postponed<enter>"
diff --git a/.mutt/mailboxes b/.mutt/mailboxes
index 5fda20c..14722ea 100644
--- a/.mutt/mailboxes
+++ b/.mutt/mailboxes
@@ -1 +1 @@
-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"
+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"
diff --git a/.mutt/muttrc b/.mutt/muttrc
index 7f6ff40..9d6891c 100644
--- a/.mutt/muttrc
+++ b/.mutt/muttrc
@@ -12,7 +12,7 @@ set tmpdir           = ~/.mutt/temp
 source ~/.mutt/crypto
 source ~/.mutt/alias
 source ~/.mutt/mailboxes
-source ~/.mutt/id_main
+source ~/.mutt/id_work
 
 # General information
 set realname = "Urbain Vaes"
@@ -57,9 +57,9 @@ set include=yes
 
 # Macros
 macro index,pager gm "<change-folder> +Main/Main<enter>" 
-macro index,pager gp "<change-folder> +Private/Private<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> +Imperial/Imperial<enter>" 
+macro index,pager gw "<change-folder> +Work/Work<enter>" 
 
 # Key bindings
 bind index,pager \Cf next-page
@@ -77,13 +77,13 @@ 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'
+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 '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'
+folder-hook 'Personal*'  'source ~/.mutt/id_personal'
+folder-hook 'Work*'     'source ~/.mutt/id_work'
 
 # Source mutt solarized
 `[ "$COLORSCHEME" = "light" ] && echo source $HOME/.mutt/solarized/mutt-colors-solarized-light-16.muttrc || echo set`
diff --git a/.offlineimap/offlineimaprc b/.offlineimap/offlineimaprc
index 154eb8a..759e39e 100644
--- a/.offlineimap/offlineimaprc
+++ b/.offlineimap/offlineimaprc
@@ -1,26 +1,25 @@
 [general]
 ui         = ttyui
 pythonfile = /home/urbain/.offlineimap.py
-accounts   = Imperial, Main, Informal, Private
+accounts   = Work, Main, Informal, Personal
 maxsyncaccounts = 4
 
-[Account Imperial]
-localrepository  = Imperial-Local
-remoterepository = Imperial-Remote
-autorefresh      = 10
+[Account Work]
+localrepository  = Work-Local
+remoterepository = Work-Remote
 
-[Repository Imperial-Local]
+[Repository Work-Local]
 type           = Maildir
-localfolders   = ~/.mail/Imperial
+localfolders   = ~/.mail/Work
 status_backend = sqlite
-nametrans      = lambda folder : {'Imperial' : 'INBOX', 'Imperial/sent' : 'Sent Items', 'Imperial/drafts' : 'Drafts', 'Imperial/bin' : 'Deleted Items'}.get(folder, folder)
+nametrans      = lambda folder : {'Work' : 'INBOX', 'Work/sent' : 'Sent Items', 'Work/drafts' : 'Drafts', 'Work/bin' : 'Deleted Items'}.get(folder, folder)
 
-[Repository Imperial-Remote]
+[Repository Work-Remote]
 type           = IMAP
 remotehost     = outlook.office365.com
 remoteuser     = uv113@ic.ac.uk
 remotepasseval = mailpasswd('imperial/u.vaes13@imperial.ac.uk')
-nametrans      = lambda folder : {'INBOX' : 'Imperial', 'Sent Items' : 'Imperial/sent', 'Drafts' : 'Imperial/drafts', 'Deleted Items' : 'Imperial/bin'}.get(folder, folder)
+nametrans      = lambda folder : {'INBOX' : 'Work', 'Sent Items' : 'Work/sent', 'Drafts' : 'Work/drafts', 'Deleted Items' : 'Work/bin'}.get(folder, folder)
 folderfilter   = lambda folder: folder in ['INBOX', 'Sent Items', 'Drafts', 'Deleted Items']
 sslcacertfile  = /etc/ssl/certs/ca-certificates.crt
 realdelete     = no
@@ -29,7 +28,6 @@ maxconnections = 3
 [Account Main]
 localrepository  = Main-Local
 remoterepository = Main-Remote
-autorefresh      = 10
 
 [Repository Main-Local]
 type           = Maildir
@@ -50,7 +48,6 @@ maxconnections = 3
 [Account Informal]
 localrepository  = Informal-Local
 remoterepository = Informal-Remote
-autorefresh      = 10
 
 [Repository Informal-Local]
 type           = Maildir
@@ -68,23 +65,22 @@ sslcacertfile  = /etc/ssl/certs/ca-certificates.crt
 realdelete     = no
 maxconnections = 3
 
-[Account Private]
-localrepository  = Private-Local
-remoterepository = Private-Remote
-autorefresh      = 10
+[Account Personal]
+localrepository  = Personal-Local
+remoterepository = Personal-Remote
 
-[Repository Private-Local]
+[Repository Personal-Local]
 type           = Maildir
-localfolders   = ~/.mail/Private
+localfolders   = ~/.mail/Personal
 status_backend = sqlite
-nametrans      = lambda folder : {'Private' : 'INBOX', 'Private/sent' : 'Sent', 'Private/drafts' : 'Drafts', 'Private/bin' : 'Trash'}.get(folder, folder)
+nametrans      = lambda folder : {'Personal' : 'INBOX', 'Personal/sent' : 'Sent', 'Personal/drafts' : 'Drafts', 'Personal/bin' : 'Trash'}.get(folder, folder)
 
-[Repository Private-Remote]
+[Repository Personal-Remote]
 type           = IMAP
 remotehost     = imap.openmailbox.org
 remoteuser     = urbain.p.vaes@openmailbox.org
 remotepasseval = mailpasswd("openmailbox/urbain.p.vaes@openmailbox.org")
-nametrans      = lambda folder : {'INBOX' : 'Private', 'Sent' : 'Private/sent', 'Drafts' : 'Private/drafts', 'Trash' : 'Private/bin'}.get(folder, folder)
+nametrans      = lambda folder : {'INBOX' : 'Personal', 'Sent' : 'Personal/sent', 'Drafts' : 'Personal/drafts', 'Trash' : 'Personal/bin'}.get(folder, folder)
 folderfilter   = lambda folder: folder in ['INBOX', 'Sent', 'Drafts', 'Trash']
 sslcacertfile  = /etc/ssl/certs/ca-certificates.crt
 realdelete     = no
@@ -92,7 +88,7 @@ maxconnections = 3
 
 [mbnames]
 enabled  = yes
-filename = ~/.mutt/mailboxes
+filename = ~/.mutt/mailboxes.offlineimap
 header   = "mailboxes "
 peritem  = "+%(accountname)s/%(foldername)s"
 sep      = " "