just use hostnames for this stuff

i don't really want another level of indirection

37 files changed, 11 insertions, 10 deletions

diff --git a/.gitignore b/.gitignore
index b6a5fda..12ca5c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,4 +28,3 @@ supervise/
 /weechat/weechat_fifo_*
 /weechat/weechat.log
 /wunderground
-/.conf-type
diff --git a/Makefile b/Makefile
index 036b0dd..bb0569d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,8 @@
 INTO := $(HOME)
-TYPE := $(file <.conf-type)
 
 all : build
 
-include Makefile.$(TYPE)
+include Makefile.$(shell hostname)
 
 INSTALL := \
     $(INSTALL) \
diff --git a/Makefile.laptop b/Makefile.hush
index 175face..175face 100644
--- a/Makefile.laptop
+++ b/Makefile.hush
diff --git a/Makefile.osx b/Makefile.st-doy1
index 5ea67d9..5ea67d9 100644
--- a/Makefile.osx
+++ b/Makefile.st-doy1
diff --git a/Makefile.server b/Makefile.tozt
index a707ce0..a707ce0 100644
--- a/Makefile.server
+++ b/Makefile.tozt
diff --git a/bashrc b/bashrc
index 5242207..d33a297 100644
--- a/bashrc
+++ b/bashrc
@@ -5,7 +5,7 @@ type rbenv > /dev/null 2>&1 && eval "$(rbenv init -)"
 test -d $HOME/.cargo/bin && export PATH="$HOME/.cargo/bin:$PATH"
 # }}}
 # environment {{{
-export PATH="${HOME}/.bin/local:${HOME}/.bin/$(cat "${HOME}/conf/.conf-type"):${HOME}/.bin:/usr/lib/ccache/bin:/usr/share/git/diff-highlight:$PATH"
+export PATH="${HOME}/.bin/local:${HOME}/.bin/$(hostname):${HOME}/.bin:/usr/lib/ccache/bin:/usr/share/git/diff-highlight:$PATH"
 [ -f "$HOME/.sh/env" ] && source $HOME/.sh/env
 # }}}
 # Test for an interactive shell. {{{
diff --git a/bin/laptop/gpg b/bin/hush/gpg
index d418711..d418711 100755
--- a/bin/laptop/gpg
+++ b/bin/hush/gpg
diff --git a/bin/laptop/gpg2 b/bin/hush/gpg2
index a7506d6..a7506d6 120000
--- a/bin/laptop/gpg2
+++ b/bin/hush/gpg2
diff --git a/bin/laptop/i3-switch-workspace b/bin/hush/i3-switch-workspace
index 8e77cf2..8e77cf2 100755
--- a/bin/laptop/i3-switch-workspace
+++ b/bin/hush/i3-switch-workspace
diff --git a/bin/laptop/kill_focused b/bin/hush/kill_focused
index 06010d4..06010d4 100755
--- a/bin/laptop/kill_focused
+++ b/bin/hush/kill_focused
diff --git a/bin/laptop/numkeys b/bin/hush/numkeys
index ab9dc14..ab9dc14 100755
--- a/bin/laptop/numkeys
+++ b/bin/hush/numkeys
diff --git a/bin/laptop/pass b/bin/hush/pass
index fd4a9aa..fd4a9aa 100755
--- a/bin/laptop/pass
+++ b/bin/hush/pass
diff --git a/bin/laptop/scp b/bin/hush/scp
index ffd8d03..ffd8d03 120000
--- a/bin/laptop/scp
+++ b/bin/hush/scp
diff --git a/bin/laptop/setup-inputs b/bin/hush/setup-inputs
index 6aaa19f..6aaa19f 100755
--- a/bin/laptop/setup-inputs
+++ b/bin/hush/setup-inputs
diff --git a/bin/laptop/sftp b/bin/hush/sftp
index ffd8d03..ffd8d03 120000
--- a/bin/laptop/sftp
+++ b/bin/hush/sftp
diff --git a/bin/laptop/ssh b/bin/hush/ssh
index 453bb11..453bb11 100755
--- a/bin/laptop/ssh
+++ b/bin/hush/ssh
diff --git a/bin/laptop/ssh-add-helper b/bin/hush/ssh-add-helper
index cae6f27..cae6f27 100755
--- a/bin/laptop/ssh-add-helper
+++ b/bin/hush/ssh-add-helper
diff --git a/bin/laptop/ssh-key-unlock b/bin/hush/ssh-key-unlock
index e2654f1..e2654f1 100755
--- a/bin/laptop/ssh-key-unlock
+++ b/bin/hush/ssh-key-unlock
diff --git a/bin/laptop/status b/bin/hush/status
index 062455d..062455d 100755
--- a/bin/laptop/status
+++ b/bin/hush/status
diff --git a/bin/laptop/svdn b/bin/hush/svdn
index ce6f4c4..ce6f4c4 100755
--- a/bin/laptop/svdn
+++ b/bin/hush/svdn
diff --git a/bin/laptop/svget b/bin/hush/svget
index 77c18f4..77c18f4 100755
--- a/bin/laptop/svget
+++ b/bin/hush/svget
diff --git a/bin/laptop/svkill b/bin/hush/svkill
index 060d2c7..060d2c7 100755
--- a/bin/laptop/svkill
+++ b/bin/hush/svkill
diff --git a/bin/laptop/svlog b/bin/hush/svlog
index 436b25a..436b25a 100755
--- a/bin/laptop/svlog
+++ b/bin/hush/svlog
diff --git a/bin/laptop/svre b/bin/hush/svre
index e57576e..e57576e 100755
--- a/bin/laptop/svre
+++ b/bin/hush/svre
diff --git a/bin/laptop/svst b/bin/hush/svst
index 92d20c1..92d20c1 100755
--- a/bin/laptop/svst
+++ b/bin/hush/svst
diff --git a/bin/laptop/svstop b/bin/hush/svstop
index 36c0132..36c0132 100755
--- a/bin/laptop/svstop
+++ b/bin/hush/svstop
diff --git a/bin/laptop/svup b/bin/hush/svup
index c49a99e..c49a99e 100755
--- a/bin/laptop/svup
+++ b/bin/hush/svup
diff --git a/bin/laptop/update-weather b/bin/hush/update-weather
index e3a6bc3..e3a6bc3 100755
--- a/bin/laptop/update-weather
+++ b/bin/hush/update-weather
diff --git a/bin/laptop/update_mail b/bin/hush/update_mail
index b909d9f..b909d9f 100755
--- a/bin/laptop/update_mail
+++ b/bin/hush/update_mail
diff --git a/bin/laptop/volume b/bin/hush/volume
index bc37b45..bc37b45 100755
--- a/bin/laptop/volume
+++ b/bin/hush/volume
diff --git a/bin/laptop/weather b/bin/hush/weather
index a0a9d14..a0a9d14 100755
--- a/bin/laptop/weather
+++ b/bin/hush/weather
diff --git a/bin/laptop/webcam b/bin/hush/webcam
index 48ee3f3..48ee3f3 100755
--- a/bin/laptop/webcam
+++ b/bin/hush/webcam
diff --git a/bin/laptop/wifi b/bin/hush/wifi
index 38c70ee..38c70ee 100755
--- a/bin/laptop/wifi
+++ b/bin/hush/wifi
diff --git a/bin/server/learn_spam b/bin/tozt/learn_spam
index ab5603a..ab5603a 100755
--- a/bin/server/learn_spam
+++ b/bin/tozt/learn_spam
diff --git a/i3/config b/i3/config
index d8b0b67..a6322d0 100644
--- a/i3/config
+++ b/i3/config
@@ -39,8 +39,8 @@ bindsym $mod+f fullscreen
 bindsym $mod+Shift+space floating toggle
 bindsym $mod+space       focus mode_toggle
 
-bindsym $mod+bracketleft  exec ~/.bin/laptop/i3-switch-workspace prev
-bindsym $mod+bracketright exec ~/.bin/laptop/i3-switch-workspace next
+bindsym $mod+bracketleft  exec i3-switch-workspace prev
+bindsym $mod+bracketright exec i3-switch-workspace next
 
 bindsym $mod+1 workspace 1
 bindsym $mod+2 workspace 2
@@ -68,7 +68,7 @@ bindsym $mod+Shift+q exec "i3-nagbar -t warning -m 'You pressed the exit shortcu
 
 bar {
     tray_output primary
-    status_command ~/.bin/laptop/status
+    status_command status
     font xft:DejaVuSansMono 10
 }
 
diff --git a/sh/env b/sh/env
index 0d0424c..ece7491 100644
--- a/sh/env
+++ b/sh/env
@@ -3,8 +3,11 @@ export MPD_HOST=bishamon
 export MANPAGER="$HOME/.bin/vimmanpager"
 export PERLDOC_PAGER="$HOME/.bin/vimmanpager"
 export EDITOR=$(/usr/bin/which vim)
-[ "$(cat "${HOME}/conf/.conf-type")" = "laptop" ] && export GIT_SSH="$HOME/.bin/laptop/ssh"
-[ "$(cat "${HOME}/conf/.conf-type")" = "laptop" ] && export RSYNC_RSH="$HOME/.bin/laptop/ssh"
+ssh="${HOME}/.bin/$(hostname)/ssh"
+if [ -x "$ssh" ]; then
+    export GIT_SSH="$ssh"
+    export RSYNC_RSH="$ssh"
+fi
 export TEXINPUTS=".:$HOME/conf/tex:"
 export LESS='-QR'
 export NOPASTE_SERVICES="ssh"
diff --git a/zshrc b/zshrc
index 1d1525c..8d22c1c 100644
--- a/zshrc
+++ b/zshrc
@@ -7,7 +7,7 @@ test -d $HOME/.cargo/bin && export PATH="$HOME/.cargo/bin:$PATH"
 # environment {{{
 # not using .zshenv, because it runs before /etc/profile, and /etc/profile
 # tends to hard-set $PATH and such
-export PATH="${HOME}/.bin/local:${HOME}/.bin/$(cat "${HOME}/conf/.conf-type"):${HOME}/.bin:/usr/lib/ccache/bin:/usr/share/git/diff-highlight:$PATH"
+export PATH="${HOME}/.bin/local:${HOME}/.bin/$(hostname):${HOME}/.bin:/usr/lib/ccache/bin:/usr/share/git/diff-highlight:$PATH"
 [ -f "$HOME/.sh/env" ] && source $HOME/.sh/env
 # }}}
 # Change the window title of X terminals {{{