diff options
Diffstat (limited to '')
| -rw-r--r-- | .caffrc | 2 | ||||
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | .msmtprc | 103 | ||||
| -rw-r--r-- | .mutt/accounts.rc | 16 | ||||
| -rw-r--r-- | .muttrc | 2 | ||||
| -rw-r--r-- | .nailrc | 9 | ||||
| -rw-r--r-- | .vm | 15 | ||||
| -rwxr-xr-x | Makefile | 21 | ||||
| -rw-r--r-- | SUBSTS | 3 |
9 files changed, 22 insertions, 150 deletions
@@ -17,7 +17,7 @@ $CONFIG{'keyid'} = [ qw{8F7BF8FC4A11C97A} ]; $CONFIG{'also-encrypt-to'} = [ qw{8F7BF8FC4A11C97A} ]; $CONFIG{'caffhome'} = $ENV{'HOME'}.'/.caff'; -$ENV{'PERL_MAILERS'} = 'sendmail:'.$ENV{'HOME'}.'/bin/msmtp/msmtp-default'; +$ENV{'PERL_MAILERS'} = [ 'sendmail', '-oem', '-oi' ]; $CONFIG{'mailer-send'} = [ 'sendmail' ]; # The options below need not be changed for normal operation. @@ -14,5 +14,4 @@ emacsen/make-* .irssi/certs/* .irssi/away.log .irssi/config.autosave -bin/msmtp .config/wpa_supplicant.conf diff --git a/.msmtprc b/.msmtprc deleted file mode 100644 index 67b801c..0000000 --- a/.msmtprc +++ /dev/null @@ -1,103 +0,0 @@ -defaults -logfile ~/.msmtp.log -domain LOCALHOST - -account default -from rak@debian.org -host smtp.gmail.com -port 587 -tls on -tls_starttls on -tls_trust_file SSL_CERTS -auth on -user ryanakca@gmail.com -password GMAIL_PASS - -account queensu -from ryan.kavanagh@queensu.ca -host smtp.office365.com -port 587 -tls on -tls_starttls on -tls_trust_file SSL_CERTS -tls_certcheck on -auth on -user 9rak@queensu.ca -password QUEENSU_PASS - -account ubuntu -from ryanakca@ubuntu.com -host smtp.gmail.com -port 587 -tls on -tls_starttls on -tls_trust_file SSL_CERTS -auth on -user ryanakca@gmail.com -password GMAIL_PASS - -account kubuntu -from ryanakca@kubuntu.org -host smtp.gmail.com -port 587 -tls on -tls_starttls on -tls_trust_file SSL_CERTS -auth on -user ryanakca@gmail.com -password GMAIL_PASS - -account queensucs -from ryan@cs.queensu.ca -host smtp.gmail.com -port 587 -tls on -tls_starttls on -tls_trust_file SSL_CERTS -auth on -user ryanakca@gmail.com -password GMAIL_PASS - -account ryanakca -from rak@ryanak.ca -host smtp.ryanak.ca -port 587 -tls on -tls_starttls on -tls_trust_file SSL_CERTS -auth login -user rak -password RYANAKCA_PASS - -account rakac -from rak@rak.ac -host smtp.ryanak.ca -port 587 -tls on -tls_starttls on -tls_trust_file SSL_CERTS -auth login -user rak -password RYANAKCA_PASS - -account cmuscs -from rkavanagh@cs.cmu.edu -host smtp.gmail.com -port 587 -tls on -tls_starttls on -tls_trust_file SSL_CERTS -auth on -user rkavanag@andrew.cmu.edu -password CMU_PASS - -account cmu -from rkavanag@andrew.cmu.edu -host smtp.gmail.com -port 587 -tls on -tls_starttls on -tls_trust_file SSL_CERTS -auth on -user rkavanag@andrew.cmu.edu -password CMU_PASS diff --git a/.mutt/accounts.rc b/.mutt/accounts.rc index f7db56b..48c87d6 100644 --- a/.mutt/accounts.rc +++ b/.mutt/accounts.rc @@ -8,7 +8,7 @@ set folder = 'imaps://ryanakca@gmail.com@imap.gmail.com';\ set postponed = '=[Google Mail]/Drafts';\ set spoolfile = '=INBOX';\ set from = 'Ryan Kavanagh <rak@debian.org>';\ -set sendmail='MSMTP_PATH';\ +set sendmail = 'sendmail -oem -oi';\ set record = '=[Google Mail]/Sent Mail';\ set copy = 'no';\ unset smtp_url;\ @@ -39,7 +39,7 @@ set imap_passive = 'no';\ set mbox = '=Read';\ unset smtp_url;\ unset smtp_pass;\ -set sendmail = 'MSMTP_PATH -a queensu';\ +set sendmail = 'sendmail -oem -oi';\ set from = 'Ryan Kavanagh <ryan.kavanagh@queensu.ca>';\ set pager_format = '-%Z-QUEENSU: %C/%m: %-20.20n %s';\ set compose_format = '-- QUEENSU: Compose [Approx. msg size: %l Atts: %a]%>-';\ @@ -69,7 +69,7 @@ set imap_passive = 'no';\ set imap_keepalive = 60;\ set folder = 'imaps://rkavanag@andrew.cmu.edu@imap.gmail.com';\ set spoolfile = '=INBOX';\ -set sendmail='MSMTP_PATH -a cmuscs';\ +set sendmail='sendmail -oem -oi';\ set from = 'Ryan Kavanagh <rkavanagh@cs.cmu.edu>';\ set mbox = '=Read';\ set record = '=[Gmail]/Sent Mail';\ @@ -97,25 +97,25 @@ macro index <F10> "cimaps://outlook.office365.com/<enter>" macro compose <F2> '<enter-command>set folder="imaps://ryanakca@gmail.com@imap.gmail.com"<enter>\ <edit-fcc><kill-line><enter>\ -<enter-command>set sendmail="MSMTP_PATH -a ubuntu"<enter>\ +<enter-command>set sendmail="sendmail -oem -oi"<enter>\ <edit-from><kill-line>Ryan Kavanagh <ryanakca@ubuntu.com><enter>' \ "Send mail from Ubuntu account" macro compose <Esc><F2> '<enter-command>set folder="imaps://ryanakca@gmail.com@imap.gmail.com"<enter>\ <edit-fcc><kill-line><enter>\ -<enter-command>set sendmail="MSMTP_PATH -a kubuntu"<enter>\ +<enter-command>set sendmail="sendmail -oem -oi"<enter>\ <edit-from><kill-line>Ryan Kavanagh <ryanakca@kubuntu.org><enter>' \ "Send mail from Kubuntu account" macro compose <F3> '<enter-command>set folder="imaps://rkavanag@andrew.cmu.edu@imap.gmail.com"<enter>\ <edit-fcc><kill-line><enter>\ -<enter-command>set sendmail="MSMTP_PATH -a cmu"<enter>\ +<enter-command>set sendmail="sendmail -oem -oi"<enter>\ <edit-from><kill-line>Ryan Kavanagh <rkavanag@andrew.cmu.edu><enter>' \ "Send mail from CMU account" macro compose <Esc><F3> '<enter-command>set folder="imaps://rkavanag@andrew.cmu.edu@imap.gmail.com"<enter>\ <edit-fcc><kill-line><enter>\ -<enter-command>set sendmail="MSMTP_PATH -a cmuscs"<enter>\ +<enter-command>set sendmail="sendmail -oem -oi"<enter>\ <edit-from><kill-line>Ryan Kavanagh <rkavanagh@cs.cmu.edu><enter>' \ "Send mail from CMU SCS account" @@ -126,7 +126,7 @@ macro compose <F4> '<enter-command>set folder="imaps://outlook.office365.com"<en macro compose <Esc><F4> '<enter-command>set folder="imaps://ryanakca@gmail.com@imap.gmail.com"<enter>\ <edit-fcc><kill-line><enter>\ -<enter-command>set sendmail="MSMTP_PATH -a queensucs"<enter>\ +<enter-command>set sendmail="sendmail -oem -oi"<enter>\ <edit-from><kill-line>Ryan Kavanagh <ryan@cs.queensu.ca><enter>' \ "Send mail from cs.queensu.ca" @@ -123,7 +123,7 @@ unignore X-Label: set mbox_type=mbox # In case it's unset -set sendmail=MSMTP_PATH +set sendmail="sendmail -oem -oi" # For the -f option to work properly with account-hooks, it looks like I need # to unset the folder option @@ -1,5 +1,5 @@ define clearset { - unset folder from sendmail record smtp password + unset folder from record smtp password unset smime-sign smime-sign-cert smime-sign-nickname unset hold } @@ -12,7 +12,6 @@ account l { account d { call clearset set folder=imap://ryan@localhost/ - set sendmail=HOMEDIR/bin/msmtp/msmtp-default set from="Ryan Kavanagh <rak@debian.org>" } @@ -21,7 +20,6 @@ account g { set from="Ryan Kavanagh <rak@debian.org>" set folder=imaps://ryanakca%40gmail.com@imap.gmail.com/ set password-ryanakca%40gmail.com@imap.gmail.com=GMAIL_mailx_PASS - set sendmail=HOMEDIR/bin/msmtp/msmtp-default set imap-keepalive=30 set hold unset MBOX @@ -34,7 +32,6 @@ account q { set folder=imaps://9rak%40queensu.ca@pod51018.outlook.com/ set imap-starttls-9rak%40queensu.ca@pod51018.outlook.com set password-9rak%40queensu.ca@pod51018.outlook.com=QUEENSU_PASS - set sendmail=HOMEDIR/bin/msmtp/msmtp-queensu set MBOX=@Read set record=@"Sent Items" @@ -46,7 +43,6 @@ account r { 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 @@ -57,7 +53,6 @@ account c { set from="Ryan Kavanagh <rkavanag@andrew.cmu.edu>" set folder=imaps://rkavanag%40andrew.cmu.edu@imap.gmail.com/ set password-rkavanag%40andrew.cmu.edu@imap.gmail.com=CMU_PASS - set sendmail=HOMEDIR/bin/msmtp/msmtp-cmu set MBOX=@Read } @@ -93,6 +88,8 @@ set MBOX=~/mbox set quote="headers" +set sendmail=sendmail + shortcut mitm imaps://rakavan@imap.exchange.mit.edu:993/ shortcut lh imap://ryan@localhost/ @@ -68,29 +68,24 @@ (setq vmpc-actions '( ("From Queens" (vmpc-composition-buffer - (setq user-mail-address "ryan.kavanagh@queensu.ca") - (setq sendmail-program "~/bin/msmtp/msmtp-queensu") ) + (setq user-mail-address "ryan.kavanagh@queensu.ca") ) (vmpc-substitute-header "From" "Ryan Kavanagh <ryan.kavanagh@queensu.ca>") (vmpc-substitute-header "IMAP-FCC" "local:QueensU.Sent Items") ) ("From Queens CS" (vmpc-composition-buffer - (setq user-mail-address "ryan@cs.queensu.ca") - (setq sendmail-program "~/bin/msmtp/msmtp-queensucs") ) + (setq user-mail-address "ryan@cs.queensu.ca") ) (vmpc-substitute-header "From" "Ryan Kavanagh <ryan@cs.queensu.ca>") ) ("From Debian" (vmpc-composition-buffer - (setq user-mail-address "rak@debian.org") - (setq sendmail-program "~/bin/msmtp/msmtp-default") ) + (setq user-mail-address "rak@debian.org") ) (vmpc-substitute-header "From" "Ryan Kavanagh <rak@debian.org>") ) ("From Ubuntu" (vmpc-composition-buffer - (setq user-mail-address "ryanakca@ubuntu.com") - (setq sendmail-program "~/bin/msmtp/msmtp-ubuntu") ) + (setq user-mail-address "ryanakca@ubuntu.com") ) (vmpc-substitute-header "From" "Ryan Kavanagh <ryanakca@ubuntu.com") ) ("From Kubuntu" (vmpc-composition-buffer - (setq user-mail-address "ryanakca@kubuntu.org") - (setq sendmail-program "~/bin/msmtp/msmtp-kubuntu") ) + (setq user-mail-address "ryanakca@kubuntu.org") ) (vmpc-substitute-header "From" "Ryan Kavanagh <ryanakca@kubuntu.org") ) ("prompt" (vmpc-prompt-for-profile) ) @@ -6,14 +6,10 @@ SUBSTS_FILE=SUBSTS.local LOCAL_FILES = \ .config/beets/config.yaml \ .config/nitrogen/nitrogen.cfg \ - .devscripts \ - .gitconfig \ .imapfilter/config.lua \ - .msmtprc \ .mutt/accounts.rc \ .mutt/gpg.rc \ .mutt/ssl.rc \ - .muttrc \ .nailrc \ .netrc \ .offlineimaprc \ @@ -98,21 +94,17 @@ MAIL_PASS = GMAIL_PASS QUEENSU_PASS RYANAKCA_PASS LOCAL_PASS CMU_PASS VARS_.config/beets/config.yaml = MBUSER MBPASS VARS_.config/nitrogen/nitrogen.cfg = HOMEDIR -VARS_.devscripts = MSMTP_PATH -VARS_.gitconfig = MSMTP_PATH VARS_.imapfilter/config.lua = LOCAL_PASS IMAPFILTER_GMAIL_SERVER GMAIL_PASS IMAP_FOLDER_SEP IMAPFILTER_LOCAL -VARS_.msmtprc = $(MAIL_PASS) LOCALHOST SSL_CERTS -VARS_.mutt/accounts.rc = $(MAIL_PASS) MSMTP_PATH +VARS_.mutt/accounts.rc = $(MAIL_PASS) VARS_.mutt/gpg.rc = PGPEWRAP_BINARY VARS_.mutt/ssl.rc = SSL_CERTS -VARS_.muttrc = MSMTP_PATH VARS_.nailrc = $(MAIL_PASS) HOMEDIR GMAIL_mailx_PASS VARS_.netrc = LOCAL_PASS GMAIL_PASS VARS_.offlineimaprc = $(MAIL_PASS) SSL_CERTS VARS_.xinitrc = SCREENLAYOUT PULSE VARS_.xmonad/xmonad.hs = XMONAD_DZEN_W XMONAD_DZEN_X XMONAD_DZEN_Y VARS_.zsh/func/prompt_wunjo_setup = ZSH_HOST_COLOUR -VARS_.zshrc = LOCALE SUBSTS_RM SUBSTS_LS MSMTP_PATH KEYCHAIN +VARS_.zshrc = LOCALE SUBSTS_RM SUBSTS_LS KEYCHAIN all: clean build @@ -121,7 +113,7 @@ all: clean build BUILD = $(patsubst %,build/%,$(GLOBAL_FILES) $(LOCAL_FILES) $(GPG_FILES)) LOCALS = $(patsubst %,build/%,$(LOCAL_FILES)) -build: $(BUILD) fonts build/bin/msmtp/msmtp-default +build: $(BUILD) fonts # We must force these with a phony target, otherwise, make will see that they're # already there (for example, from installing the rest of .mutt or .zsh) and @@ -151,11 +143,6 @@ emacsen: fonts: [ "$(BUILD_FONTS)" != "True" ] || $(MAKE) -C .fonts install -build/bin/msmtp/msmtp-default: build/.msmtprc - -mkdir -p $(dir $@) - awk '/account/ { FNAME = "$(dir $@)/msmtp-"$$2; print "#!/bin/sh" > FNAME ; print "$(call get-val,MSMTP_PATH) -a " $$2 " \"$$@\"" >> FNAME }' $< - chmod 755 build/bin/msmtp/* - $(LOCALS): .FORCE build/%: % $(SUBSTS_FILE) @[ -d $(dir $@) ] || mkdir -p $(dir $@) @@ -171,7 +158,7 @@ build/%: % $(SUBSTS_FILE) install: build -diff -u ~/.mutt/alias.rc build/.mutt/alias.rc rsync -a build/ ~ - chmod 600 ~/.msmtprc ~/.netrc ~/.ssh/id_* + chmod 600 ~/.netrc ~/.ssh/id_* chmod 700 ~/.ssh -[ "$(BUILD_FONTS)" != "True" ] || fc-cache ~/.fonts @@ -26,9 +26,6 @@ SCREENLAYOUT zeta-home # Locale LOCALE en_CA.UTF-8 -# path to msmtp -MSMTP_PATH /usr/bin/msmtp - # colour of hostname in zsh prompt ZSH_HOST_COLOUR Green |