diff --git a/gitignore b/gitignore
index 4ff08ba..b32dd6f 100644
--- a/gitignore
+++ b/gitignore
@@ -1,2 +1,7 @@
 tags
+.tags
+
 surge.sh
+
+._*
+.DS_Store
diff --git a/tools/install_osx.sh b/tools/install_osx.sh
new file mode 100755
index 0000000..1203d71
--- /dev/null
+++ b/tools/install_osx.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+# Symlink to default locations
+for fn in $(cat tools/locations); do
+  [ -z "$fn" ] && continue
+  ln -vsi $PWD/$fn $HOME/.$fn
+done
diff --git a/vimrc b/vimrc
index d4e9af8..ff12d97 100644
--- a/vimrc
+++ b/vimrc
@@ -1,5 +1,5 @@
 " System {{{
-set shell=/usr/bin/zsh
+set shell=$SHELL
 
 set runtimepath+=~/.dotfiles/vim
 set packpath+=~/.dotfiles/vim