cleanup

40 files changed, 34 insertions, 81 deletions

diff --git a/.gitmodules b/.gitmodules
index 3eb4b41..7bee380 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -23,8 +23,8 @@
 	path = vim/.vim/bundle/tagbar
 	url = https://github.com/majutsushi/tagbar.git
 [submodule "urxvt/.urxvt/urxvt-perls"]
-	path = urxvt/.urxvt/urxvt-perls
+	path = by_host/Linux/urxvt/.urxvt/urxvt-perls
 	url = git://github.com/muennich/urxvt-perls.git
 [submodule "urxvt/.urxvt/urxvt-tabbedex"]
-	path = urxvt/.urxvt/urxvt-tabbedex
+	path = by_host/Linux/urxvt/.urxvt/urxvt-tabbedex
 	url = git://github.com/stepb/urxvt-tabbedex.git
diff --git a/X/.Xdefaults b/by_host/Linux/X/.Xdefaults
index 3b1353f..3b1353f 100644
--- a/X/.Xdefaults
+++ b/by_host/Linux/X/.Xdefaults
diff --git a/X/.Xmodmap b/by_host/Linux/X/.Xmodmap
index 37b4dcc..37b4dcc 100644
--- a/X/.Xmodmap
+++ b/by_host/Linux/X/.Xmodmap
diff --git a/X/.xbindkeysrc b/by_host/Linux/X/.xbindkeysrc
index d90e22e..d90e22e 100644
--- a/X/.xbindkeysrc
+++ b/by_host/Linux/X/.xbindkeysrc
diff --git a/X/.xinitrc b/by_host/Linux/X/.xinitrc
index f8e4d77..f8e4d77 100644
--- a/X/.xinitrc
+++ b/by_host/Linux/X/.xinitrc
diff --git a/feh/.fehbg b/by_host/Linux/feh/.fehbg
index 4416428..4416428 100644
--- a/feh/.fehbg
+++ b/by_host/Linux/feh/.fehbg
diff --git a/gtk/.gtkrc-2.0 b/by_host/Linux/gtk/.gtkrc-2.0
index 2612320..2612320 100644
--- a/gtk/.gtkrc-2.0
+++ b/by_host/Linux/gtk/.gtkrc-2.0
diff --git a/imwheel/.imwheelrc b/by_host/Linux/imwheel/.imwheelrc
index c6961a5..c6961a5 100644
--- a/imwheel/.imwheelrc
+++ b/by_host/Linux/imwheel/.imwheelrc
diff --git a/khal/.config/khal/khal.conf b/by_host/Linux/khal/.config/khal/khal.conf
index 51acd22..51acd22 100644
--- a/khal/.config/khal/khal.conf
+++ b/by_host/Linux/khal/.config/khal/khal.conf
diff --git a/mozilla/.mozilla/firefox/pks.default/searchplugins/amazon.xml b/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/amazon.xml
index 3aed0f9..3aed0f9 100644
--- a/mozilla/.mozilla/firefox/pks.default/searchplugins/amazon.xml
+++ b/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/amazon.xml
diff --git a/mozilla/.mozilla/firefox/pks.default/searchplugins/duckduckgo.xml b/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/duckduckgo.xml
index 90397d8..90397d8 100644
--- a/mozilla/.mozilla/firefox/pks.default/searchplugins/duckduckgo.xml
+++ b/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/duckduckgo.xml
diff --git a/mozilla/.mozilla/firefox/pks.default/searchplugins/ebay.xml b/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/ebay.xml
index 6a0da13..6a0da13 100644
--- a/mozilla/.mozilla/firefox/pks.default/searchplugins/ebay.xml
+++ b/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/ebay.xml
diff --git a/mozilla/.mozilla/firefox/pks.default/searchplugins/geizhals.xml b/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/geizhals.xml
index 0a0c895..0a0c895 100644
--- a/mozilla/.mozilla/firefox/pks.default/searchplugins/geizhals.xml
+++ b/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/geizhals.xml
diff --git a/mozilla/.mozilla/firefox/pks.default/searchplugins/google-de.xml b/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/google-de.xml
index bfd7a00..bfd7a00 100644
--- a/mozilla/.mozilla/firefox/pks.default/searchplugins/google-de.xml
+++ b/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/google-de.xml
diff --git a/mozilla/.mozilla/firefox/pks.default/searchplugins/google.xml b/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/google.xml
index 1eed48c..1eed48c 100644
--- a/mozilla/.mozilla/firefox/pks.default/searchplugins/google.xml
+++ b/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/google.xml
diff --git a/mozilla/.mozilla/firefox/pks.default/searchplugins/imdb.xml b/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/imdb.xml
index 2d34ab7..2d34ab7 100644
--- a/mozilla/.mozilla/firefox/pks.default/searchplugins/imdb.xml
+++ b/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/imdb.xml
diff --git a/mozilla/.mozilla/firefox/pks.default/searchplugins/img.xml b/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/img.xml
index 52e8bb9..52e8bb9 100644
--- a/mozilla/.mozilla/firefox/pks.default/searchplugins/img.xml
+++ b/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/img.xml
diff --git a/mozilla/.mozilla/firefox/pks.default/searchplugins/leo-frde.xml b/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/leo-frde.xml
index 062878f..062878f 100644
--- a/mozilla/.mozilla/firefox/pks.default/searchplugins/leo-frde.xml
+++ b/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/leo-frde.xml
diff --git a/mozilla/.mozilla/firefox/pks.default/searchplugins/leo-itde.xml b/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/leo-itde.xml
index 93e14bd..93e14bd 100644
--- a/mozilla/.mozilla/firefox/pks.default/searchplugins/leo-itde.xml
+++ b/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/leo-itde.xml
diff --git a/mozilla/.mozilla/firefox/pks.default/searchplugins/leo-rude.xml b/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/leo-rude.xml
index 8ef6811..8ef6811 100644
--- a/mozilla/.mozilla/firefox/pks.default/searchplugins/leo-rude.xml
+++ b/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/leo-rude.xml
diff --git a/mozilla/.mozilla/firefox/pks.default/searchplugins/leo.xml b/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/leo.xml
index 8b400e7..8b400e7 100644
--- a/mozilla/.mozilla/firefox/pks.default/searchplugins/leo.xml
+++ b/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/leo.xml
diff --git a/mozilla/.mozilla/firefox/pks.default/searchplugins/wetteronline.xml b/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/wetteronline.xml
index 00eefbe..00eefbe 100644
--- a/mozilla/.mozilla/firefox/pks.default/searchplugins/wetteronline.xml
+++ b/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/wetteronline.xml
diff --git a/mozilla/.mozilla/firefox/pks.default/searchplugins/wikipedia.xml b/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/wikipedia.xml
index a294b99..a294b99 100644
--- a/mozilla/.mozilla/firefox/pks.default/searchplugins/wikipedia.xml
+++ b/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/wikipedia.xml
diff --git a/mozilla/.mozilla/firefox/pks.default/searchplugins/wikipediade.xml b/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/wikipediade.xml
index 6bc9557..6bc9557 100644
--- a/mozilla/.mozilla/firefox/pks.default/searchplugins/wikipediade.xml
+++ b/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/wikipediade.xml
diff --git a/mozilla/.mozilla/firefox/pks.default/searchplugins/youtube.xml b/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/youtube.xml
index a936264..a936264 100644
--- a/mozilla/.mozilla/firefox/pks.default/searchplugins/youtube.xml
+++ b/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/youtube.xml
diff --git a/mozilla/.mozilla/firefox/profiles.ini b/by_host/Linux/mozilla/.mozilla/firefox/profiles.ini
index 8330f4e..8330f4e 100644
--- a/mozilla/.mozilla/firefox/profiles.ini
+++ b/by_host/Linux/mozilla/.mozilla/firefox/profiles.ini
diff --git a/mpv/.config/mpv/mpv.conf b/by_host/Linux/mpv/.config/mpv/mpv.conf
index 00fdbaa..00fdbaa 100644
--- a/mpv/.config/mpv/mpv.conf
+++ b/by_host/Linux/mpv/.config/mpv/mpv.conf
diff --git a/mtools/.mtoolsrc b/by_host/Linux/mtools/.mtoolsrc
index f4d8458..f4d8458 100644
--- a/mtools/.mtoolsrc
+++ b/by_host/Linux/mtools/.mtoolsrc
diff --git a/ncftp/.ncftp/prefs_v3 b/by_host/Linux/ncftp/.ncftp/prefs_v3
index 595ea0f..595ea0f 100644
--- a/ncftp/.ncftp/prefs_v3
+++ b/by_host/Linux/ncftp/.ncftp/prefs_v3
diff --git a/photorec/.photorec.cfg b/by_host/Linux/photorec/.photorec.cfg
index 5aefac8..5aefac8 100644
--- a/photorec/.photorec.cfg
+++ b/by_host/Linux/photorec/.photorec.cfg
diff --git a/ratpoison/.ratpoisonrc b/by_host/Linux/ratpoison/.ratpoisonrc
index f9257c5..f9257c5 100644
--- a/ratpoison/.ratpoisonrc
+++ b/by_host/Linux/ratpoison/.ratpoisonrc
diff --git a/rtorrent/.rtorrent.rc b/by_host/Linux/rtorrent/.rtorrent.rc
index 3dfa1a2..3dfa1a2 100644
--- a/rtorrent/.rtorrent.rc
+++ b/by_host/Linux/rtorrent/.rtorrent.rc
diff --git a/urxvt/.urxvt/urxvt-perls b/by_host/Linux/urxvt/.urxvt/urxvt-perls
-Subproject 7cc64be09250a508013e1f31886d5198f765978
+Subproject 7cc64be09250a508013e1f31886d5198f765978
diff --git a/urxvt/.urxvt/urxvt-tabbedex b/by_host/Linux/urxvt/.urxvt/urxvt-tabbedex
-Subproject 49c1514b218d222560600e6f20955389287ac6b
+Subproject 49c1514b218d222560600e6f20955389287ac6b
diff --git a/xdg/.config/user-dirs.dirs b/by_host/Linux/xdg/.config/user-dirs.dirs
index a7ee923..a7ee923 100644
--- a/xdg/.config/user-dirs.dirs
+++ b/by_host/Linux/xdg/.config/user-dirs.dirs
diff --git a/clamz/.clamz/config b/clamz/.clamz/config
deleted file mode 100644
index ef2881d..0000000
--- a/clamz/.clamz/config
+++ /dev/null
@@ -1,28 +0,0 @@
-## Clamz configuration file
-
-## Default format for output filenames.  This may contain any of
-## the following variables:
-##
-##  ${title} ${creator} ${album} ${tracknum} ${album_artist}
-##  ${genre} ${discnum} ${suffix} ${asin} ${album_asin}
-##
-## The name format may also contain slashes, if you'd like to
-## categorize your files in subdirectories.
-NameFormat       "${tracknum} - ${title}.${suffix}"
-
-## The base directory in which to store downloaded music.
-## If unset, it defaults to the current directory.
-# OutputDir       "/home/me/Music"
-
-## Set to True to allow uppercase in filenames.
-## False to convert to lowercase.
-AllowUppercase   True
-
-## Set to True to output UTF-8 filenames, False to output ASCII only,
-## UseLocale to check the system locale setting.
-AllowUTF8        UseLocale
-
-## The set of ASCII characters which are disallowed.  (Control
-## characters and slashes are always disallowed.)
-ForbidChars      "!\"$*:;<>?\\`|~"
-
diff --git a/cups/.cups/lpoptions b/cups/.cups/lpoptions
deleted file mode 100644
index eeb1fc7..0000000
--- a/cups/.cups/lpoptions
+++ /dev/null
@@ -1,2 +0,0 @@
-Dest home ColorModel=Gray KCEcoprint/EcoPrint=On
-Default home
diff --git a/newsbeuter/.newsbeuter/config b/newsbeuter/.newsbeuter/config
deleted file mode 100644
index 3e2bbe0..0000000
--- a/newsbeuter/.newsbeuter/config
+++ /dev/null
@@ -1,25 +0,0 @@
-highlight  article      "^Title: .*$"   magenta   black bold
-color      listnormal                   white     black 
-color      listfocus                    magenta   black
-color      listfocus_unread             black     white 
-color      info                         color7    black
-color      article                      color246  black
-
-#highlight  feedlist     "^.* N .*$"     color15   default  bold
-#highlight  articlelist  "^.* N .*$"     color15   default  bold
-#highlight  article      "^Feed: .*$"    color3    default
-#highlight  article      "^Author: .*$"  color5    default
-#highlight  article      "^Link: .*$"    blue      default
-#highlight  article      "^Date: .*$"    color4    default
-
-browser "firefox &>/dev/null"
-show-read-articles no
-
-bind-key j down
-bind-key k up
-bind-key h left
-bind-key l right 
-bind-key m toggle-show-read-feeds
-bind-key a mark-feed-read
-bind-key o open-in-browser-and-mark-read
-
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 .
 
diff --git a/theano/.theanorc b/theano/.theanorc
deleted file mode 100644
index 804d835..0000000
--- a/theano/.theanorc
+++ /dev/null
@@ -1,9 +0,0 @@
-[global]
-floatX=float32
-on_unused_input=warn
-device=cpu
-openmp=True
-
-[blas]
-ldflags = -L/fast_scratch/simianer/nmt/OpenBLAS -lopenblas
-