diff options
| -rw-r--r-- | .devscripts | 1 | ||||
| -rw-r--r-- | .mutt/accounts.rc | 20 | ||||
| -rw-r--r-- | .nailrc | 18 | ||||
| -rw-r--r-- | .tmux-mail.conf | 2 |
4 files changed, 20 insertions, 21 deletions
diff --git a/.devscripts b/.devscripts deleted file mode 100644 index b3387f6..0000000 --- a/.devscripts +++ /dev/null @@ -1 +0,0 @@ -BTS_SENDMAIL_COMMAND="MSMTP_PATH -t" diff --git a/.mutt/accounts.rc b/.mutt/accounts.rc index 03157f5..b1b2b6b 100644 --- a/.mutt/accounts.rc +++ b/.mutt/accounts.rc @@ -45,10 +45,10 @@ set pager_format = '-%Z-QUEENSU: %C/%m: %-20.20n %s';\ set compose_format = '-- QUEENSU: Compose [Approx. msg size: %l Atts: %a]%>-';\ set status_format = '-%r-QUEENSU: %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?l? %l?]---(%s/%S)-%>-(%P)---'" -account-hook imaps://imap.ryanak.ca \ +account-hook imaps://imap.rak.ac \ "set imap_user = 'rak';\ set imap_pass = 'RYANAKCA_PASS';\ -set folder = 'imaps://imap.ryanak.ca/';\ +set folder = 'imaps://imap.rak.ac/';\ set record = '=Sent';\ set copy = 'yes';\ set postponed = '=Drafts';\ @@ -56,7 +56,7 @@ set spoolfile = '=Virtual.INBOX';\ set mbox = '=RAK';\ unset smtp_url;\ unset smtp_pass;\ -set sendmail = 'MSMTP_PATH -a ryanakca';\ +set sendmail = '/usr/sbin/sendmail -oem -oi';\ set from = 'Ryan Kavanagh <rak@rak.ac>';\ set pager_format = '-%Z-RAK.AC: %C/%m: %-20.20n %s';\ set compose_format = '-- RAK.AC: Compose [Approx. msg size: %l Atts: %a]%>-';\ @@ -130,21 +130,21 @@ macro compose <Esc><F4> '<enter-command>set folder="imaps://ryanakca@gmail.com@i <edit-from><kill-line>Ryan Kavanagh <ryan@cs.queensu.ca><enter>' \ "Send mail from cs.queensu.ca" -macro compose <F5> '<enter-command>set folder="imaps://ryanakca@gmail.com@imap.gmail.com"<enter>\ -<edit-fcc><kill-line><enter>\ -<enter-command>set sendmail="MSMTP_PATH"<enter>\ +macro compose <F5> '<enter-command>set folder="imaps://imap.rak.ac/"<enter>\ +<edit-fcc><kill-line>=Sent<enter>\ +<enter-command>set sendmail="/usr/sbin/sendmail -oem -oi"<enter>\ <edit-from><kill-line>Ryan Kavanagh <rak@debian.org><enter>' \ "Send mail from Debian account" -macro compose <Esc><F6> '<enter-command>set folder="imaps://imap.ryanak.ca/"<enter>\ +macro compose <Esc><F6> '<enter-command>set folder="imaps://imap.rak.ac/"<enter>\ <edit-fcc><kill-line>=Sent<enter>\ -<enter-command>set sendmail="MSMTP_PATH -a ryanakca"<enter>\ +<enter-command>set sendmail="/usr/sbin/sendmail -oem -oi"<enter>\ <edit-from><kill-line>Ryan Kavanagh <rak@ryanak.ca><enter>' \ "Send mail from ryanak.ca" -macro compose <F6> '<enter-command>set folder="imaps://imap.ryanak.ca/"<enter>\ +macro compose <F6> '<enter-command>set folder="imaps://imap.rak.ac/"<enter>\ <edit-fcc><kill-line>=Sent<enter>\ -<enter-command>set sendmail="MSMTP_PATH -a rakac"<enter>\ +<enter-command>set sendmail="/usr/sbin/sendmail -oem -oi"<enter>\ <edit-from><kill-line>Ryan Kavanagh <rak@rak.ac><enter>' \ "Send mail from rak.ac" @@ -6,7 +6,7 @@ define clearset { account l { call clearset - set from="rak@ryanak.ca (Ryan Kavanagh)" + set from="rak@rak.ac (Ryan Kavanagh)" } account d { @@ -42,11 +42,11 @@ account q { account r { call clearset - set from="Ryan Kavanagh <rak@ryanak.ca>" - set folder=imaps://rak@imap.ryanak.ca/ - set imap-starttls-rak@imap.ryanak.ca - set password-rak@imap.ryanak.ca=RYANAKCA_PASS - set sendmail=HOMEDIR/bin/msmtp/msmtp-ryanakca + set from="Ryan Kavanagh <rak@rak.ac>" + set folder=imaps://rak@imap.rak.ac/ + set imap-starttls-rak@imap.rak.ac + set password-rak@imap.rak.ac=RYANAKCA_PASS + set sendmail=/usr/sbin/sendmail set MBOX=@Read set record=@Sent @@ -65,8 +65,8 @@ account c { source ~/.mailx-aliases.rc source ~/.mailrc -set password-rak@imap.ryanak.ca=RYANAKCA_PASS -set record=imaps://rak@imap.ryanak.ca/Sent +set password-rak@imap.rak.ac=RYANAKCA_PASS +set record=imaps://rak@imap.rak.ac/Sent # Don't display X-Brightmail-Tracker header cruft ignore "X-Brightmail-Tracker" @@ -107,7 +107,7 @@ set indentprefix="> " # Don't strip names/comments when replying set fullnames # My other addresses -set alternates="ryanakca@gmail.com,rak@debian.org,rak@ryanak.ca,rkavanag@andrew.cmu.edu,rkavanag@cs.cmu.edu,rkavanagh@cs.cmu.edu,ryan@cs.queensu.ca" +set alternates="ryanakca@gmail.com,rak@debian.org,rak@rak.ac,rak@ryanak.ca,rkavanag@andrew.cmu.edu,rkavanag@cs.cmu.edu,rkavanagh@cs.cmu.edu,ryan@cs.queensu.ca" # Give header when replying set quote diff --git a/.tmux-mail.conf b/.tmux-mail.conf index cb30a75..ddcbd9e 100644 --- a/.tmux-mail.conf +++ b/.tmux-mail.conf @@ -1,7 +1,7 @@ source-file ~/.tmux.conf new-session -s mail -d -n mutt 'neomutt -f imaps://rkavanag%40andrew.cmu.edu@imap.gmail.com' -split-window -c '~' 'neomutt -f imaps://imap.ryanak.ca' +split-window -c '~' 'neomutt -f imaps://imap.rak.ac' split-window -c '~' -h 'neomutt -f imaps://ryanakca@gmail.com@imap.gmail.com/' new-window -d -c '~' -n aether 'ssh aether.rak.ac' new-window -d -c '~' -n eos 'ssh eos.rak.ac' |