summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Kinkade <nath@nkinka.de>2014-06-19 10:24:09 -0400
committerNathan Kinkade <nath@nkinka.de>2014-06-19 10:24:09 -0400
commit256504a4a75b9b4f0ef71031cacc53fd4034a98d (patch)
tree0bca46a788500d6c1470308c8f1c924096a91030
parentf6622342a3ea897cda394e4a65173c90309bafc3 (diff)
Only do certain actions if on my local machine.
-rw-r--r--bashrc17
1 files changed, 10 insertions, 7 deletions
diff --git a/bashrc b/bashrc
index 9003f52..fcc5dfb 100644
--- a/bashrc
+++ b/bashrc
@@ -76,11 +76,6 @@ if [ -f /etc/bash_completion ]; then
. /etc/bash_completion
fi
-# setup keychain
-/usr/bin/keychain ~/.ssh/id_dsa
-/usr/bin/keychain ~/.ssh/id_rsa
-. ~/.keychain/${HOSTNAME}-sh
-
# set a reasonable EDITOR
export EDITOR=vim
@@ -96,5 +91,13 @@ cd() {
# ifconfig lives in sbin
export PATH=$PATH:/sbin
-# custom keyboard mappings
-xmodmap ~/.Xmodmap
+# Only do these things on local machine
+if [ $(hostname) == 'npk' ]; then
+ # setup keychain
+ /usr/bin/keychain ~/.ssh/id_dsa
+ /usr/bin/keychain ~/.ssh/id_rsa
+ . ~/.keychain/${HOSTNAME}-sh
+
+ # custom keyboard mappings
+ xmodmap ~/.Xmodmap
+fi