# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1535739157 0
# Node ID b0a3022c9a1d55df6a1c4eecdb7fdb7d991f2c19
# Parent  4f79770c440fb780ff709b2333fcc8ffd2aa7d24# Parent  1043163c84c73d226aea7c0557ca8af6e35e1f07
Merge.

diff -r 4f79770c440f -r b0a3022c9a1d bin/bootstrap.sh
--- a/bin/bootstrap.sh	Fri Aug 31 18:12:25 2018 +0000
+++ b/bin/bootstrap.sh	Fri Aug 31 18:12:37 2018 +0000
@@ -4,17 +4,17 @@
 
 set -e
 
-echo "prerequisites: python git pip dulwich tmux weechat offlineimap mutt hg ack zsh vim"
-
 function ensure_link {
-    test -L "$HOME/$2" || ln -s "$HOME/$1" "$HOME/$2"
+    test -L "$HOME/$2" || test ! -e "$HOME/$1" || ln -s "$HOME/$1" "$HOME/$2"
 }
 
 mkdir -p ~/.config/fish
+mkdir -p ~/.config/nvim
 mkdir -p ~/src/hg
 mkdir -p ~/src/virtualenvs
 mkdir -p ~/bin
 mkdir -p ~/src
+mkdir -p ~/.w3m
 mkdir -p ~/Library/KeyBindings
 
 ensure_link "src/dotfiles/hgrc" ".hgrc"
@@ -26,36 +26,35 @@
 
 test -d ~/src/dotfiles || hg clone http://bitbucket.org/sjl/dotfiles ~/src/dotfiles
 
-ensure_link "src/dotfiles/DefaultKeyBinding.dict" "Library/KeyBindings/DefaultKeyBinding.dict"
-ensure_link "src/dotfiles/slate"               ".slate"
-ensure_link "src/dotfiles/tmux/tmux.conf"      ".tmux.conf"
-ensure_link "src/dotfiles/vim"                 ".vim"
-ensure_link "src/dotfiles/vim/vimrc"           ".vimrc"
-ensure_link "src/dotfiles/gitconfig"           ".gitconfig"
-ensure_link "src/dotfiles/ackrc"               ".ackrc"
-ensure_link "src/dotfiles/weechat"             ".weechat"
-ensure_link "src/dotfiles/urlview"             ".urlview"
-ensure_link "src/dotfiles/pentadactylrc"       ".pentadactylrc"
-ensure_link "src/dotfiles/vimperatorrc"        ".vimperatorrc"
-ensure_link "src/dotfiles/offlineimaprc"       ".offlineimaprc"
-ensure_link "src/dotfiles/mutt"                ".mutt"
-ensure_link "src/dotfiles/dotjs"               ".js"
-ensure_link "src/dotfiles/dotcss"              ".css"
-ensure_link "src/dotfiles/hgignore"            ".hgignore"
-ensure_link "src/dotfiles/gitignore"           ".gitignore"
-ensure_link "src/dotfiles/ffignore"            ".ffignore"
-ensure_link "src/dotfiles/agignore"            ".agignore"
-ensure_link "src/dotfiles/ctags"               ".ctags"
-ensure_link "src/dotfiles/grc"                 ".grc"
-ensure_link "src/dotfiles/bash_profile"        ".bash_profile"
-ensure_link "src/dotfiles/inputrc"             ".inputrc"
-ensure_link "src/dotfiles/fish/config.fish"    ".config/fish/config.fish"
-ensure_link "src/dotfiles/fish/functions"      ".config/fish/functions"
-ensure_link "src/dotfiles/ipython"             ".ipython"
-ensure_link "src/dotfiles/sbclrc"              ".sbclrc"
-ensure_link "src/dotfiles/eclrc"               ".eclrc"
-ensure_link "src/dotfiles/abclrc"              ".abclrc"
-ensure_link "src/dotfiles/ccl-init.lisp"       ".ccl-init.lisp"
+ensure_link "src/dotfiles/Xmodmap"              ".Xmodmap"
+ensure_link "src/dotfiles/abclrc"               ".abclrc"
+ensure_link "src/dotfiles/agignore"             ".agignore"
+ensure_link "src/dotfiles/bash_profile"         ".bash_profile"
+ensure_link "src/dotfiles/browsrc"              ".browsrc"
+ensure_link "src/dotfiles/ccl-init.lisp"        ".ccl-init.lisp"
+ensure_link "src/dotfiles/config-nvim-init.vim" ".config/nvim/init.vim"
+ensure_link "src/dotfiles/ctags"                ".ctags"
+ensure_link "src/dotfiles/dunstrc"              ".dunstrc"
+ensure_link "src/dotfiles/eclrc"                ".eclrc"
+ensure_link "src/dotfiles/ffignore"             ".ffignore"
+ensure_link "src/dotfiles/fish/config.fish"     ".config/fish/config.fish"
+ensure_link "src/dotfiles/fish/functions"       ".config/fish/functions"
+ensure_link "src/dotfiles/gitconfig"            ".gitconfig"
+ensure_link "src/dotfiles/gitignore"            ".gitignore"
+ensure_link "src/dotfiles/hgignore"             ".hgignore"
+ensure_link "src/dotfiles/lispwords"            ".lispwords"
+ensure_link "src/dotfiles/mutt"                 ".mutt"
+ensure_link "src/dotfiles/mutt/mailcap"         ".mailcap"
+ensure_link "src/dotfiles/mutt/muttrc"          ".muttrc"
+ensure_link "src/dotfiles/mutt/notmuch-config"  ".notmuch-config"
+ensure_link "src/dotfiles/psqlrc"               ".psqlrc"
+ensure_link "src/dotfiles/sbclrc"               ".sbclrc"
+ensure_link "src/dotfiles/stumpwmrc"            ".stumpwmrc"
+ensure_link "src/dotfiles/tmux/tmux.conf"       ".tmux.conf"
+ensure_link "src/dotfiles/vim"                  ".vim"
+ensure_link "src/dotfiles/vim/vimrc"            ".vimrc"
+ensure_link "src/dotfiles/w3m-keymap"           ".w3m/keymap"
+ensure_link "src/dotfiles/weechat"              ".weechat"
+ensure_link "src/dotfiles/xsessionrc"           ".xsessionrc"
 
-echo remember to copy the notmuch-config
-echo completed
+echo done