1 files changed, 16 insertions, 47 deletions
diff --git a/setup.sh b/setup.sh
index a943394..c9b8034 100755
--- a/setup.sh
+++ b/setup.sh
@@ -1,57 +1,26 @@
 #!/bin/zsh -x
 
-rm $HOME/.clamz \
-   $HOME/.config \
-   $HOME/.newsbeuter \
-   $HOME/.moc \
-   $HOME/.mozilla \
-   $HOME/.ncftp \
-   $HOME/.urxvt
+SPECIAL=(.clamz      \
+         .config     \
+         .newsbeuter \
+         .moc        \
+         .mozilla    \
+         .ncftp      \
+         .urxvt      \
+         .vim
+        )
 
-mkdir -p $HOME/.clamz \
-         $HOME/.config \
-         $HOME/.newsbeuter \
-         $HOME/.moc \
-         $HOME/.mozilla/pks.default/searchplugins \
-         $HOME/.ncftp \
-         $HOME/.urxvt
-
-PKG=(\
-  clamz      \
-  feh        \
-  git        \
-  gtk        \
-  htop       \
-  imwheel    \
-  input      \
-  khal       \
-  moc        \
-  mozilla    \
-  mpv        \
-  multitail  \
-  mutt       \
-  ncftp      \
-  newsbeuter \
-  npm        \
-  ratpoison  \
-  rtorrent   \
-  subversion \
-  tex        \
-  theano     \
-  tmux       \
-  urxvt      \
-  vim        \
-  X          \
-  xdg        \
-  zsh        \
-)
+for i in SPECIAL; do
+  rm $HOME/$i
+  mkdir -p $HOME/$i
+done
 
-for i in $PKG; do
+for i in $(ls -1 | grep -v -P "(setup.sh|additional.files)"); do
   stow -t $HOME $i
 done
 
-git submodule foreach init
-git submodule update
+git submodule foreach git submodule init
+git submodule foreach git submodule update
 
 cd $HOME/.urxvt; ln -s urxvt-perls/clipboard .; ln -s urxvt-perls/keyboard-select .; ln -s urxvt-tabbedex/tabbedex .; ln -s urxvt-perls/url-select .