Switch to stow

26 files changed, 14 insertions, 30 deletions

diff --git a/.gitmodules b/.gitmodules
index 4af9f39..cbfc814 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,45 +1,45 @@
 [submodule ".oh-my-zsh"]
-	path = .oh-my-zsh
+	path = zsh/.oh-my-zsh
 	url = git://github.com/robbyrussell/oh-my-zsh.git
 [submodule ".vim/bundle/nerdtree"]
-	path = .vim/bundle/nerdtree
+	path = vim/.vim/bundle/nerdtree
 	url = https://github.com/scrooloose/nerdtree.git
 [submodule ".vim/bundle/python-mode"]
-	path = .vim/bundle/python-mode
+	path = vim/.vim/bundle/python-mode
 	url = git://github.com/klen/python-mode.git
 [submodule ".vim/bundle/vim-fugitive"]
-	path = .vim/bundle/vim-fugitive
+	path = vim/.vim/bundle/vim-fugitive
 	url = git://github.com/tpope/vim-fugitive.git
 [submodule ".vim/bundle/ctrlp.vim"]
-	path = .vim/bundle/ctrlp.vim
+	path = vim/.vim/bundle/ctrlp.vim
 	url = https://github.com/kien/ctrlp.vim.git
 [submodule ".vim/bundle/rainbow_parentheses.vim"]
-	path = .vim/bundle/rainbow_parentheses.vim
+	path = vim/.vim/bundle/rainbow_parentheses.vim
 	url = https://github.com/kien/rainbow_parentheses.vim.git
 [submodule ".vim/bundle/tagbar"]
-	path = .vim/bundle/tagbar
+	path = vim/.vim/bundle/tagbar
 	url = https://github.com/majutsushi/tagbar.git
 [submodule ".vim/bundle/sessionman.vim"]
-	path = .vim/bundle/sessionman.vim
+	path = vim/.vim/bundle/sessionman.vim
 	url = https://github.com/vim-scripts/sessionman.vim.git
 [submodule ".vim/bundle/vim-surround"]
-	path = .vim/bundle/vim-surround
+	path = vim/.vim/bundle/vim-surround
 	url = https://github.com/tpope/vim-surround.git
 [submodule ".vim/bundle/vim-ipython"]
-	path = .vim/bundle/vim-ipython
+	path = vim/.vim/bundle/vim-ipython
 	url = https://github.com/ivanov/vim-ipython.git
 [submodule ".vim/bundle/molokai"]
-	path = .vim/bundle/molokai
+	path = vim/.vim/bundle/molokai
 	url = https://github.com/tomasr/molokai.git
 [submodule ".vim/bundle/vimwiki"]
-	path = .vim/bundle/vimwiki
+	path = vim/.vim/bundle/vimwiki
 	url = git://github.com/vim-scripts/vimwiki.git
 [submodule ".vim/bundle/julia-vim"]
-	path = .vim/bundle/julia-vim
+	path = vim/.vim/bundle/julia-vim
 	url = git://github.com/JuliaLang/julia-vim.git
 [submodule ".vim/pig.vim"]
 	path = .vim/pig.vim
 	url = https://github.com/motus/pig.vim.git
 [submodule ".vim/bundle/pig.vim"]
-	path = .vim/bundle/pig.vim
+	path = vim/.vim/bundle/pig.vim
 	url = https://github.com/motus/pig.vim.git
diff --git a/.vim/pig.vim b/.vim/pig.vim
deleted file mode 160000
-Subproject 4157cac950c49ca6fb59f1dec2a41f2df90a92e
diff --git a/README b/README
deleted file mode 100644
index 93b3570..0000000
--- a/README
+++ /dev/null
@@ -1,6 +0,0 @@
-This configuration relies on external git repositories which are handled as
-submodules. After the first clone use git submodule update --init to import all
-the submodules.
-
-Run ./deploy.sh to deploy dotfiles to the home dir.
-Change the first line in deploy.sh to deploy to another dir.
diff --git a/deploy b/deploy
deleted file mode 100755
index 1a53e6c..0000000
--- a/deploy
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /bin/sh
-DEPLOY_DIR=$HOME/ #don't forget the trailing slash
-
-cd ${0%/*}
-find -type d ! \( -type d -path "*.git" -prune \) -print0 | xargs -0 -I '{}' mkdir -p $DEPLOY_DIR{}
-find ! \( -type d -path "*.git" -prune \) -type f ! -path "./deploy" ! -path "./README" -print0 | while IFS="" read -r -d "" file
-do
-    ln -snf $PWD/$file $DEPLOY_DIR${file%/*}
-done
-
diff --git a/.dmenu/dmenurc b/dmenu/.dmenu/dmenurc
index 2e68bd1..2e68bd1 100644
--- a/.dmenu/dmenurc
+++ b/dmenu/.dmenu/dmenurc
diff --git a/.dmenu/open.sh b/dmenu/.dmenu/open.sh
index a9b9da6..a9b9da6 100755
--- a/.dmenu/open.sh
+++ b/dmenu/.dmenu/open.sh
diff --git a/.git_ignore b/git/.git_ignore
index 25b9412..25b9412 100644
--- a/.git_ignore
+++ b/git/.git_ignore
diff --git a/.gitconfig b/git/.gitconfig
index a4472b1..a4472b1 100644
--- a/.gitconfig
+++ b/git/.gitconfig
diff --git a/.gvimrc b/vim/.gvimrc
index 6b7b63c..6b7b63c 100644
--- a/.gvimrc
+++ b/vim/.gvimrc
diff --git a/.vim/autoload/pathogen.vim b/vim/.vim/autoload/pathogen.vim
index 16c21fe..16c21fe 100644
--- a/.vim/autoload/pathogen.vim
+++ b/vim/.vim/autoload/pathogen.vim
diff --git a/.vim/bundle/ctrlp.vim b/vim/.vim/bundle/ctrlp.vim
-Subproject b5d3fe66a58a13d2ff8b6391f4387608496a030
+Subproject b5d3fe66a58a13d2ff8b6391f4387608496a030
diff --git a/.vim/bundle/julia-vim b/vim/.vim/bundle/julia-vim
-Subproject 84815cec6c0c277297f2557d563550a0e7e25f5
+Subproject 84815cec6c0c277297f2557d563550a0e7e25f5
diff --git a/.vim/bundle/molokai b/vim/.vim/bundle/molokai
-Subproject db8ce13b3737d3ddea8368498183d7c204a762e
+Subproject db8ce13b3737d3ddea8368498183d7c204a762e
diff --git a/.vim/bundle/nerdtree b/vim/.vim/bundle/nerdtree
-Subproject bcf3de4fdffae45fc7c85b6b84a01b37177924a
+Subproject bcf3de4fdffae45fc7c85b6b84a01b37177924a
diff --git a/.vim/bundle/pig.vim b/vim/.vim/bundle/pig.vim
-Subproject 4157cac950c49ca6fb59f1dec2a41f2df90a92e
+Subproject 4157cac950c49ca6fb59f1dec2a41f2df90a92e
diff --git a/.vim/bundle/python-mode b/vim/.vim/bundle/python-mode
-Subproject c6a872a64530979f4aac46d765c577581cb7fc3
+Subproject c6a872a64530979f4aac46d765c577581cb7fc3
diff --git a/.vim/bundle/rainbow_parentheses.vim b/vim/.vim/bundle/rainbow_parentheses.vim
-Subproject eb8baa5428bde10ecc1cb14eed1d6e16f5f2469
+Subproject eb8baa5428bde10ecc1cb14eed1d6e16f5f2469
diff --git a/.vim/bundle/sessionman.vim b/vim/.vim/bundle/sessionman.vim
-Subproject 845d35b84c5c51f631d8bfa4afe3edc126102ba
+Subproject 845d35b84c5c51f631d8bfa4afe3edc126102ba
diff --git a/.vim/bundle/tagbar b/vim/.vim/bundle/tagbar
-Subproject 7b36c46d17d57db34fdb0adac9ba6382d0bb5e6
+Subproject 7b36c46d17d57db34fdb0adac9ba6382d0bb5e6
diff --git a/.vim/bundle/vim-fugitive b/vim/.vim/bundle/vim-fugitive
-Subproject b319b694539017dcd789dc2c42f784a30d7b28b
+Subproject b319b694539017dcd789dc2c42f784a30d7b28b
diff --git a/.vim/bundle/vim-ipython b/vim/.vim/bundle/vim-ipython
-Subproject 42499f094b805b90b683afa5009cee99abd0bb7
+Subproject 42499f094b805b90b683afa5009cee99abd0bb7
diff --git a/.vim/bundle/vim-surround b/vim/.vim/bundle/vim-surround
-Subproject 2d05440ad23f97a7874ebd9b5de3a0e65d25d85
+Subproject 2d05440ad23f97a7874ebd9b5de3a0e65d25d85
diff --git a/.vim/bundle/vimwiki b/vim/.vim/bundle/vimwiki
-Subproject cb5c38a575bcdffa52747aef962dc9d61c7a820
+Subproject cb5c38a575bcdffa52747aef962dc9d61c7a820
diff --git a/.vimrc b/vim/.vimrc
index 11f9e42..11f9e42 100644
--- a/.vimrc
+++ b/vim/.vimrc
diff --git a/.oh-my-zsh b/zsh/.oh-my-zsh
-Subproject 192de6bcffb0294e19f4203f6f7dc1a7f3e427b
+Subproject 192de6bcffb0294e19f4203f6f7dc1a7f3e427b
diff --git a/.zshrc b/zsh/.zshrc
index a75baf7..a75baf7 100644
--- a/.zshrc
+++ b/zsh/.zshrc