adds lots

diff --git a/.bashrc b/.bashrc
index ac77da5..518a014 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -16,7 +16,7 @@ export COLORFGBG="default:default"
 #Colors yeeeyyyy
 alias ls='ls --color=auto'
 alias grep='grep --color=auto'
-alias email='offlineimap -c ~/.mutt/offlineimaprc -u ttyui; mutt; offlineimap -c ~/.mutt/offlineimaprc &'
+alias email='mutt'
 
 #Watch youtube videos in the terminal
 function ytview {

diff --git a/README.md b/README.md
index dc2e95a..58d8875 100644 (file)
--- a/README.md
+++ b/README.md
@@ -3,5 +3,9 @@ Yay dotfiles to share
 
 Also includes a script to install it:)
 
-Todo:
-add mutt, offlineimap, msmtp, Xresources, i3
+notes:
+* For msmtp I've patched my msmtp to have the --password flag included using the patch found at https://aur.archlinux.org/packages/msmtp-pwpatched/
+* In bashrc there are two functions concerning encrypted cloud storage, for more info: http://martlubbers.net/nsa-dropbox.html
+
+TODO:
+* screen, irssi

diff --git a/install b/install
index db6246f..9b47660 100755 (executable)
--- a/install
+++ b/install
@@ -3,3 +3,5 @@ cp -if `pwd`/.vimrc ~/.vimrc
 cp -if `pwd`/.bashrc ~/.bashrc
 cp -if `pwd`/.Xresources ~/.Xresources
 cp -if `pwd`/muttrc ~/.mutt/muttrc
+cp -if `pwd`/msmtp ~/.mutt/msmtp
+cp -if `pwd`/offlineimaprc ~/.mutt/offlineimaprc

diff --git a/msmtp b/msmtp
new file mode 100644 (file)
index 0000000..3473efc
--- /dev/null
+++ b/msmtp
@@ -0,0 +1,8 @@
+account net
+host mail.martlubbers.net
+port 587
+auth on 
+tls on
+tls_certcheck off
+user mart@martlubbers.net
+from mart@martlubbers.net

diff --git a/muttrc b/muttrc
index 4c4fe7e..76c7c4d 100644 (file)
--- a/muttrc
+++ b/muttrc
@@ -3,13 +3,19 @@ set realname="Mart Lubbers"
 set from="mart@martlubbers.net"
 set use_from=yes
 set envelope_from=yes
-set sendmail="/usr/bin/msmtp -C /home/mart/.mutt/msmtp -f mart@martlubbers.net -a net"
+set my_msmtp_pass=`gpg --use-agent -d ~/passwd.gpg | grep -i mail | awk '{print $3}'`
+set sendmail="/usr/local/bin/msmtp -C /home/mart/.mutt/msmtp --password=$my_msmtp_pass -f mart@martlubbers.net -a net"
 set my_hdr="X-PGP-Key: http://www.martlubbers.net/mart@martlubbers.net.asc"
 
+# Macros
 # Force offlineimap to refresh in the background
-macro index,pager \CR "<shell-escape>offlineimap -c ~/.mutt/offlineimaprc &<enter>" "Force refresh"
+macro index,pager \CR "<shell-escape>offlineimap -c ~/.mutt/offlineimaprc -k Repository_Remote:password=$my_msmtp_pass &<enter>" "Force refresh"
 # Move all the mailing lists to the appropriate folder
-macro index,pager \CT "<tag-pattern>~C vim@vim.org | ~C vim_use<enter><tag-prefix-cond><save-message>=vim<enter><end-cond><tag-pattern>~C lists.debian.org<enter><tag-prefix-cond><save-message>=debian<enter><end-cond><tag-pattern>~C mutt-users@mutt.org<enter><tag-prefix-cond><save-message>=mutt<enter><end-cond><sync-mailbox>" "Clean up mailing lists"
+macro index,pager \CT "\
+<tag-pattern>~C vim@vim.org | ~C vim_use<enter><tag-prefix-cond><save-message>=vim<enter><end-cond>\
+<tag-pattern>~C lists.debian.org<enter><tag-prefix-cond><save-message>=debian<enter><end-cond>\
+<tag-pattern>~C mutt-users@mutt.org<enter><tag-prefix-cond><save-message>=mutt<enter><end-cond>\
+<sync-mailbox>" "Clean up mailing lists"
 
 # Folders
 set mbox_type=Maildir
@@ -99,7 +105,7 @@ color index brightyellow default ~N# New
 color index blue default ~T# Tagged
 color index red default ~D# Deleted
 
-#Crypto stuff
+#Crypto
 set pgp_decode_command="gpg %?p?--passphrase-fd 0? --no-verbose --batch --output - %f"
 set pgp_verify_command="gpg --no-verbose --batch --output - --verify %s %f"
 set pgp_decrypt_command="gpg --passphrase-fd 0 --no-verbose --batch --output - %f"

diff --git a/offlineimaprc b/offlineimaprc
new file mode 100644 (file)
index 0000000..81fcc3a
--- /dev/null
+++ b/offlineimaprc
@@ -0,0 +1,26 @@
+[general]
+metadata = ~/.mutt/offlineimap_meta
+accounts = net
+ui = quiet
+
+[Account net]
+localrepository = Local
+remoterepository = Remote
+
+[Repository Local]
+type = Maildir
+localfolders = ~/.mutt/mail
+
+[Repository Remote]
+type = IMAP
+remotehost = mail.martlubbers.net
+remoteuser = mart@martlubbers.net
+ssl = yes
+
+[mbnames]
+enabled = yes
+filename = ~/.mutt/mailboxes
+header = "mailboxes "
+peritem = "~/.mutt/mail/%(foldername)s/"
+sep = " "
+footer = "\n"