X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=README.md;h=8187cbf1f02341b2211c9e7ae8f7682dcf4516cd;hb=92b4da48579e56f47b7c7bdd10208ffc695a6883;hp=c1a57c982e0307e21ab10b1d97e876b7f09ecccf;hpb=5223e76a4302c4de131593feea3987398c60445d;p=dotfiles.git

diff --git a/README.md b/README.md
index c1a57c9..8187cbf 100644
--- a/README.md
+++ b/README.md
@@ -1,23 +1,19 @@
-Yay dotfiles to share
-=====================
+# Dotfiles.
 
-Also includes a script to install it:)
+Tip: use GNU stow
 
-<<<<<<< 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
+`stow -t ~/ NAME`
 
-TODO:
-* screen, irssi
-=======
-Containts:
-- vimrc
-- i3 config including custom bar and lock
-- Xresources with nice colorscheme and transparant terminals
-- bashrc
-- muttrc
+Where NAME is:
 
-Todo:
-add offlineimap, msmtp
->>>>>>> 35592efa3b150a2efcb320ffb12aaa66e2c1f43c
+| `NAME` | contents
+--- | ---
+| cal | khard, khal, vdirsyncer
+| email | mutt, offlineimap, notmuch, msmtp
+| git | git
+| pgp | gpg, gpg-agent
+| shell | bash, top, readline
+| vim | vim, vim-gnupg, vim-syntastic
+| vimperator | vimperator
+| x | i3, i3status, urxvt, font, gv, askpass
+| misc\_binaries | screenshot script