diff options
-rw-r--r-- | Makefile | 10 | ||||
-rw-r--r-- | git/gitconfig.m4 | 4 | ||||
-rw-r--r-- | mutt/muttrc.m4 (renamed from mutt/muttrc) | 2 |
3 files changed, 14 insertions, 2 deletions
@@ -56,6 +56,7 @@ NAME := Tom Ryder EMAIL := tom@sanctum.geek.nz KEY := 0xC14286EA77BB8872 +SENDMAIL := /usr/bin/msmtp all : git/gitconfig gnupg/gpg.conf @@ -64,6 +65,7 @@ clean distclean : git/gitconfig \ gnupg/gpg.conf \ man/man7/dotfiles.7 \ + mutt/muttrc \ tmux/tmux.conf git/gitconfig : git/gitconfig.m4 @@ -71,6 +73,7 @@ git/gitconfig : git/gitconfig.m4 -D DOTFILES_NAME="$(NAME)" \ -D DOTFILES_EMAIL="$(EMAIL)" \ -D DOTFILES_KEY="$(KEY)" \ + -D DOTFILES_SENDMAIL="$(SENDMAIL)" \ git/gitconfig.m4 > git/gitconfig gnupg/gpg.conf : gnupg/gpg.conf.m4 @@ -81,6 +84,11 @@ man/man7/dotfiles.7 : README.markdown man/man7/dotfiles.7.header cat man/man7/dotfiles.7.header README.markdown | \ pandoc -sS -t man -o "$@" +mutt/muttrc : mutt/muttrc.m4 + m4 \ + -D DOTFILES_SENDMAIL="$(SENDMAIL)" \ + mutt/muttrc.m4 > mutt/muttrc + TMUX_COLOR := colour237 tmux/tmux.conf : tmux/tmux.conf.m4 @@ -182,7 +190,7 @@ install-maildir : "$(HOME)"/Mail/sent/new \ "$(HOME)"/Mail/sent/tmp -install-mutt : install-maildir +install-mutt : mutt/muttrc install-maildir install -m 0755 -d -- \ "$(HOME)"/.mutt \ "$(HOME)"/.cache/mutt diff --git a/git/gitconfig.m4 b/git/gitconfig.m4 index c25e0dda..ea6b1220 100644 --- a/git/gitconfig.m4 +++ b/git/gitconfig.m4 @@ -24,6 +24,10 @@ [push] default = matching +[sendemail] + confirm = compose + smtpServer = DOTFILES_SENDMAIL + [status] short = true diff --git a/mutt/muttrc b/mutt/muttrc.m4 index 4f252477..44883c32 100644 --- a/mutt/muttrc +++ b/mutt/muttrc.m4 @@ -8,7 +8,7 @@ set use_from = yes set reverse_name = yes # SMTP implementation -set sendmail = '/usr/bin/msmtp' +set sendmail = 'DOTFILES_SENDMAIL' # Mailbox type and location set mbox_type = 'Maildir' |