48 files changed, 5 insertions, 5 deletions
diff --git a/.gitmodules b/.gitmodules
index 7bee380..885a1cc 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 = by_host/Linux/urxvt/.urxvt/urxvt-perls
+	path = by_os/Linux/urxvt/.urxvt/urxvt-perls
 	url = git://github.com/muennich/urxvt-perls.git
 [submodule "urxvt/.urxvt/urxvt-tabbedex"]
-	path = by_host/Linux/urxvt/.urxvt/urxvt-tabbedex
+	path = by_os/Linux/urxvt/.urxvt/urxvt-tabbedex
 	url = git://github.com/stepb/urxvt-tabbedex.git
diff --git a/by_host/Darwin/cups/.cups/lpoptions b/by_host/Darwin/cups/.cups/lpoptions
deleted file mode 100644
index bf56f78..0000000
--- a/by_host/Darwin/cups/.cups/lpoptions
+++ /dev/null
@@ -1 +0,0 @@
-Default KM1B3A41
diff --git a/by_os/Darwin/cups/.cups/lpoptions b/by_os/Darwin/cups/.cups/lpoptions
new file mode 100644
index 0000000..c26cf6c
--- /dev/null
+++ b/by_os/Darwin/cups/.cups/lpoptions
@@ -0,0 +1 @@
+Default Kyocera_ECOSYS_P6021cdn
diff --git a/by_host/Darwin/input/.inputrc b/by_os/Darwin/input/.inputrc
index 0fe68cf..0fe68cf 100644
--- a/by_host/Darwin/input/.inputrc
+++ b/by_os/Darwin/input/.inputrc
diff --git a/by_host/Darwin/mutt/.mutt/mailcap b/by_os/Darwin/mutt/.mutt/mailcap
index a319c8c..a319c8c 100644
--- a/by_host/Darwin/mutt/.mutt/mailcap
+++ b/by_os/Darwin/mutt/.mutt/mailcap
diff --git a/by_host/Darwin/mutt/.mutt/open-in-safari b/by_os/Darwin/mutt/.mutt/open-in-safari
index 0e122f5..0e122f5 100755
--- a/by_host/Darwin/mutt/.mutt/open-in-safari
+++ b/by_os/Darwin/mutt/.mutt/open-in-safari
diff --git a/by_host/Darwin/newsbeuter/.newsbeuter/config b/by_os/Darwin/newsbeuter/.newsbeuter/config
index a358dbc..a358dbc 100644
--- a/by_host/Darwin/newsbeuter/.newsbeuter/config
+++ b/by_os/Darwin/newsbeuter/.newsbeuter/config
diff --git a/by_host/Darwin/task/.taskrc b/by_os/Darwin/task/.taskrc
index fec3497..fec3497 100644
--- a/by_host/Darwin/task/.taskrc
+++ b/by_os/Darwin/task/.taskrc
diff --git a/by_host/Linux/X/.Xdefaults b/by_os/Linux/X/.Xdefaults
index 3b1353f..3b1353f 100644
--- a/by_host/Linux/X/.Xdefaults
+++ b/by_os/Linux/X/.Xdefaults
diff --git a/by_host/Linux/X/.Xmodmap b/by_os/Linux/X/.Xmodmap
index 37b4dcc..37b4dcc 100644
--- a/by_host/Linux/X/.Xmodmap
+++ b/by_os/Linux/X/.Xmodmap
diff --git a/by_host/Linux/X/.xbindkeysrc b/by_os/Linux/X/.xbindkeysrc
index d90e22e..d90e22e 100644
--- a/by_host/Linux/X/.xbindkeysrc
+++ b/by_os/Linux/X/.xbindkeysrc
diff --git a/by_host/Linux/X/.xinitrc b/by_os/Linux/X/.xinitrc
index f8e4d77..f8e4d77 100644
--- a/by_host/Linux/X/.xinitrc
+++ b/by_os/Linux/X/.xinitrc
diff --git a/by_host/Linux/cups/.cups/lpoptions b/by_os/Linux/cups/.cups/lpoptions
index eeb1fc7..eeb1fc7 100644
--- a/by_host/Linux/cups/.cups/lpoptions
+++ b/by_os/Linux/cups/.cups/lpoptions
diff --git a/by_host/Linux/feh/.fehbg b/by_os/Linux/feh/.fehbg
index 4416428..4416428 100644
--- a/by_host/Linux/feh/.fehbg
+++ b/by_os/Linux/feh/.fehbg
diff --git a/by_host/Linux/gtk/.gtkrc-2.0 b/by_os/Linux/gtk/.gtkrc-2.0
index 2612320..2612320 100644
--- a/by_host/Linux/gtk/.gtkrc-2.0
+++ b/by_os/Linux/gtk/.gtkrc-2.0
diff --git a/by_host/Linux/imwheel/.imwheelrc b/by_os/Linux/imwheel/.imwheelrc
index c6961a5..c6961a5 100644
--- a/by_host/Linux/imwheel/.imwheelrc
+++ b/by_os/Linux/imwheel/.imwheelrc
diff --git a/by_host/Linux/input/.inputrc b/by_os/Linux/input/.inputrc
index b08e399..b08e399 100644
--- a/by_host/Linux/input/.inputrc
+++ b/by_os/Linux/input/.inputrc
diff --git a/by_host/Linux/khal/.config/khal/khal.conf b/by_os/Linux/khal/.config/khal/khal.conf
index 51acd22..51acd22 100644
--- a/by_host/Linux/khal/.config/khal/khal.conf
+++ b/by_os/Linux/khal/.config/khal/khal.conf
diff --git a/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/amazon.xml b/by_os/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/amazon.xml
index 3aed0f9..3aed0f9 100644
--- a/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/amazon.xml
+++ b/by_os/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/amazon.xml
diff --git a/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/duckduckgo.xml b/by_os/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/duckduckgo.xml
index 90397d8..90397d8 100644
--- a/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/duckduckgo.xml
+++ b/by_os/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/duckduckgo.xml
diff --git a/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/ebay.xml b/by_os/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/ebay.xml
index 6a0da13..6a0da13 100644
--- a/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/ebay.xml
+++ b/by_os/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/ebay.xml
diff --git a/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/geizhals.xml b/by_os/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/geizhals.xml
index 0a0c895..0a0c895 100644
--- a/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/geizhals.xml
+++ b/by_os/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/geizhals.xml
diff --git a/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/google-de.xml b/by_os/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/google-de.xml
index bfd7a00..bfd7a00 100644
--- a/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/google-de.xml
+++ b/by_os/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/google-de.xml
diff --git a/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/google.xml b/by_os/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/google.xml
index 1eed48c..1eed48c 100644
--- a/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/google.xml
+++ b/by_os/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/google.xml
diff --git a/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/imdb.xml b/by_os/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/imdb.xml
index 2d34ab7..2d34ab7 100644
--- a/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/imdb.xml
+++ b/by_os/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/imdb.xml
diff --git a/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/img.xml b/by_os/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/img.xml
index 52e8bb9..52e8bb9 100644
--- a/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/img.xml
+++ b/by_os/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/img.xml
diff --git a/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/leo-frde.xml b/by_os/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/leo-frde.xml
index 062878f..062878f 100644
--- a/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/leo-frde.xml
+++ b/by_os/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/leo-frde.xml
diff --git a/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/leo-itde.xml b/by_os/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/leo-itde.xml
index 93e14bd..93e14bd 100644
--- a/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/leo-itde.xml
+++ b/by_os/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/leo-itde.xml
diff --git a/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/leo-rude.xml b/by_os/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/leo-rude.xml
index 8ef6811..8ef6811 100644
--- a/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/leo-rude.xml
+++ b/by_os/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/leo-rude.xml
diff --git a/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/leo.xml b/by_os/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/leo.xml
index 8b400e7..8b400e7 100644
--- a/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/leo.xml
+++ b/by_os/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/leo.xml
diff --git a/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/wetteronline.xml b/by_os/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/wetteronline.xml
index 00eefbe..00eefbe 100644
--- a/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/wetteronline.xml
+++ b/by_os/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/wetteronline.xml
diff --git a/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/wikipedia.xml b/by_os/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/wikipedia.xml
index a294b99..a294b99 100644
--- a/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/wikipedia.xml
+++ b/by_os/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/wikipedia.xml
diff --git a/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/wikipediade.xml b/by_os/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/wikipediade.xml
index 6bc9557..6bc9557 100644
--- a/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/wikipediade.xml
+++ b/by_os/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/wikipediade.xml
diff --git a/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/youtube.xml b/by_os/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/youtube.xml
index a936264..a936264 100644
--- a/by_host/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/youtube.xml
+++ b/by_os/Linux/mozilla/.mozilla/firefox/pks.default/searchplugins/youtube.xml
diff --git a/by_host/Linux/mozilla/.mozilla/firefox/profiles.ini b/by_os/Linux/mozilla/.mozilla/firefox/profiles.ini
index 8330f4e..8330f4e 100644
--- a/by_host/Linux/mozilla/.mozilla/firefox/profiles.ini
+++ b/by_os/Linux/mozilla/.mozilla/firefox/profiles.ini
diff --git a/by_host/Linux/mpv/.config/mpv/mpv.conf b/by_os/Linux/mpv/.config/mpv/mpv.conf
index 00fdbaa..00fdbaa 100644
--- a/by_host/Linux/mpv/.config/mpv/mpv.conf
+++ b/by_os/Linux/mpv/.config/mpv/mpv.conf
diff --git a/by_host/Linux/mtools/.mtoolsrc b/by_os/Linux/mtools/.mtoolsrc
index f4d8458..f4d8458 100644
--- a/by_host/Linux/mtools/.mtoolsrc
+++ b/by_os/Linux/mtools/.mtoolsrc
diff --git a/by_host/Linux/mutt/.mutt/mailcap b/by_os/Linux/mutt/.mutt/mailcap
index 8aaaa7e..8aaaa7e 100644
--- a/by_host/Linux/mutt/.mutt/mailcap
+++ b/by_os/Linux/mutt/.mutt/mailcap
diff --git a/by_host/Linux/ncftp/.ncftp/prefs_v3 b/by_os/Linux/ncftp/.ncftp/prefs_v3
index 595ea0f..595ea0f 100644
--- a/by_host/Linux/ncftp/.ncftp/prefs_v3
+++ b/by_os/Linux/ncftp/.ncftp/prefs_v3
diff --git a/by_host/Linux/newsbeuter/.newsbeuter/config b/by_os/Linux/newsbeuter/.newsbeuter/config
index 3e2bbe0..3e2bbe0 100644
--- a/by_host/Linux/newsbeuter/.newsbeuter/config
+++ b/by_os/Linux/newsbeuter/.newsbeuter/config
diff --git a/by_host/Linux/photorec/.photorec.cfg b/by_os/Linux/photorec/.photorec.cfg
index 5aefac8..5aefac8 100644
--- a/by_host/Linux/photorec/.photorec.cfg
+++ b/by_os/Linux/photorec/.photorec.cfg
diff --git a/by_host/Linux/ratpoison/.ratpoisonrc b/by_os/Linux/ratpoison/.ratpoisonrc
index f9257c5..f9257c5 100644
--- a/by_host/Linux/ratpoison/.ratpoisonrc
+++ b/by_os/Linux/ratpoison/.ratpoisonrc
diff --git a/by_host/Linux/rtorrent/.rtorrent.rc b/by_os/Linux/rtorrent/.rtorrent.rc
index 3dfa1a2..3dfa1a2 100644
--- a/by_host/Linux/rtorrent/.rtorrent.rc
+++ b/by_os/Linux/rtorrent/.rtorrent.rc
diff --git a/by_host/Linux/task/.taskrc b/by_os/Linux/task/.taskrc
index fec3497..fec3497 100644
--- a/by_host/Linux/task/.taskrc
+++ b/by_os/Linux/task/.taskrc
diff --git a/by_host/Linux/urxvt/.urxvt/urxvt-perls b/by_os/Linux/urxvt/.urxvt/urxvt-perls
-Subproject 7cc64be09250a508013e1f31886d5198f765978
+Subproject 7cc64be09250a508013e1f31886d5198f765978
diff --git a/by_host/Linux/urxvt/.urxvt/urxvt-tabbedex b/by_os/Linux/urxvt/.urxvt/urxvt-tabbedex
-Subproject 49c1514b218d222560600e6f20955389287ac6b
+Subproject 49c1514b218d222560600e6f20955389287ac6b
diff --git a/by_host/Linux/xdg/.config/user-dirs.dirs b/by_os/Linux/xdg/.config/user-dirs.dirs
index a7ee923..a7ee923 100644
--- a/by_host/Linux/xdg/.config/user-dirs.dirs
+++ b/by_os/Linux/xdg/.config/user-dirs.dirs
diff --git a/setup.sh b/setup.sh
index 75a0365..3f42a2a 100755
--- a/setup.sh
+++ b/setup.sh
@@ -2,7 +2,7 @@
 
 symlink () 
 {
-  for i in `find . -type d -depth 1 | grep -v .git | sed "s|./||" | grep -v by_host`; do
+  for i in `find . -maxdepth 1 -type d | grep -v .git | sed "s|./||" | grep -v by_os | grep -v "^\.$"`; do
     stow -t $HOME $i
   done
 }
@@ -30,7 +30,7 @@ if [[ $(uname) == "Linux" ]]; then
 fi
 
 symlink
-cd by_host/$(uname); symlink
+cd by_os/$(uname); symlink
 
 git submodule update --init --recursive
 if [[ $(uname) == "Linux" ]]; then