Merge branch 'master' of https://github.com/dopefishh/dotfiles

Conflicts:
	README.md
	install
	muttrc

diff --cc README.md
index 58d8875,549c6b6..c1a57c9
--- 1/README.md
--- 2/README.md
+++ b/README.md
@@@ -3,9 -3,12 +3,21 @@@ Yay dotfiles to shar
  
  Also includes a script to install it:)
  
++<<<<<<< HEAD
 +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
++=======
+ Containts:
+ - vimrc
+ - i3 config including custom bar and lock
+ - Xresources with nice colorscheme and transparant terminals
+ - bashrc
+ - muttrc
+ 
+ Todo:
+ add offlineimap, msmtp
++>>>>>>> 35592efa3b150a2efcb320ffb12aaa66e2c1f43c

diff --cc install
index 9b47660,5c8fcca..6f51c0b
--- 1/install
--- 2/install
+++ b/install
@@@ -3,5 -3,6 +3,11 @@@ cp -if `pwd`/.vimrc ~/.vimr
  cp -if `pwd`/.bashrc ~/.bashrc
  cp -if `pwd`/.Xresources ~/.Xresources
  cp -if `pwd`/muttrc ~/.mutt/muttrc
++<<<<<<< HEAD
 +cp -if `pwd`/msmtp ~/.mutt/msmtp
 +cp -if `pwd`/offlineimaprc ~/.mutt/offlineimaprc
++=======
+ mkdir -p ~/.i3
+ cp -if `pwd`/i3/* ~/.i3/
+ cp -if `pwd`/.xinitrc ~/.xinitrc
++>>>>>>> 35592efa3b150a2efcb320ffb12aaa66e2c1f43c

diff --cc muttrc
index 76c7c4d,df48b41..de6534c
--- 1/muttrc
--- 2/muttrc
+++ b/muttrc
@@@ -3,19 -3,21 +3,31 @@@ set realname="Mart Lubbers
  set from="mart@martlubbers.net"
  set use_from=yes
  set envelope_from=yes
+ <<<<<<< HEAD
 +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"
++=======
++<<<<<<< HEAD
+ <<<<<<< HEAD
+ set sendmail="/usr/bin/msmtp --passwordeval -C /home/mart/.mutt/msmtp -f mart@martlubbers.net -a net"
+ =======
+ set sendmail="/usr/bin/msmtp -C /home/mart/.mutt/msmtp -f mart@martlubbers.net -a net"
+ >>>>>>> 1cce2d664871e9f0f910a8f6c044c92b129b73a8
+ =======
+ set sendmail="/usr/bin/msmtp -C /home/mart/.mutt/msmtp -f mart@martlubbers.net -a net"
+ >>>>>>> 1cce2d664871e9f0f910a8f6c044c92b129b73a8
++>>>>>>> 35592efa3b150a2efcb320ffb12aaa66e2c1f43c
  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