1 files changed, 32 insertions, 15 deletions
diff --git a/setup.sh b/setup.sh
index baa4d55..f321a72 100755
--- a/setup.sh
+++ b/setup.sh
@@ -1,26 +1,43 @@
 #!/bin/zsh -x
 
-SPECIAL=(.clamz      \
-         .config     \
-         .newsbeuter \
-         .moc        \
-         .mozilla    \
-         .ncftp      \
-         .urxvt      \
-         .vim
-        )
+symlink () 
+{
+  for i in `find . -type d -depth 1 | grep -v .git | sed "s|./||" | grep -v by_host`; do
+    stow -t $HOME $i
+  done
+}
+
+DIRS=(.config     \
+      .newsbeuter \
+      .moc        \
+      .vim        \
+      .mutt/tmp
+      )
+DIRS_Linux=(.mozilla \
+            .ncftp   \
+            .urxvt
+            )
 
 for i in $SPECIAL; do
   rm $HOME/$i
   mkdir -p $HOME/$i
 done
+if [[ $(uname) == "Linux" ]]; then
+  for i $SPECIAL_Linux; do
+    rm $HOME/$i
+    mkdir -p $HOME/$i
+  done
+fi
 
-for i in $(ls -1 | grep -v -P "(setup.sh|additional.files)"); do
-  stow -t $HOME $i
-done
+symlink
+cd by_host/$(uname); symlink
 
-git submodule foreach git submodule init
-git submodule foreach git submodule update
+git submodule update --init --recursive
+if [[ $(uname) == "Linux" ]]; then
+  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 .
+fi
 
-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 .