summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bashrc/main.sh4
-rw-r--r--bashrc/node/init.sh2
-rw-r--r--bashrc/node/laptop.sh9
-rw-r--r--bashrc/node/laptop/alias.sh1
-rw-r--r--bashrc/node/laptop/set-bell.sh2
5 files changed, 6 insertions, 12 deletions
diff --git a/bashrc/main.sh b/bashrc/main.sh
index 444d204..7199867 100644
--- a/bashrc/main.sh
+++ b/bashrc/main.sh
@@ -58,7 +58,7 @@ _load() {
esac
fi
- if [[ -r ${base}/${path} ]]; then
+ if [[ -r ${base}/${path} || ($1 == "node" && $2 == "*") ]]; then
source ${base}/${path}
elif [[ ${pedantic} -eq 1 ]]; then
echo "error: cannot find necessary startup file: ${base}/${path}"
@@ -109,4 +109,4 @@ _load common bashcomp
_load dist common
# load distribution specific node settings
-_load node ${_DISTNAME}
+_load node ${_DISTNAME}
diff --git a/bashrc/node/init.sh b/bashrc/node/init.sh
index 7683cd9..446493a 100644
--- a/bashrc/node/init.sh
+++ b/bashrc/node/init.sh
@@ -2,4 +2,4 @@
declare -r _NODENAME=${HOSTNAME}
-_load node $_NODENAME
+_load node '*'
diff --git a/bashrc/node/laptop.sh b/bashrc/node/laptop.sh
deleted file mode 100644
index b9f131b..0000000
--- a/bashrc/node/laptop.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-# personal stuff for my laptop
-export PULSE_SERVER="unix:/var/run/pulse/native"
-export SDL_AUDIODRIVER="pulse"
-export BROWSER="viewurl-opera.sh"
-
-setterm -blength 1
-setterm -bfreq 50
-
-alias deluge_ssh="ssh -NL 58846:s100:58846 alxhome"
diff --git a/bashrc/node/laptop/alias.sh b/bashrc/node/laptop/alias.sh
new file mode 100644
index 0000000..d152eb1
--- /dev/null
+++ b/bashrc/node/laptop/alias.sh
@@ -0,0 +1 @@
+alias deluge-ssh='ssh -NL 58846:s100:58846 alxhome'
diff --git a/bashrc/node/laptop/set-bell.sh b/bashrc/node/laptop/set-bell.sh
new file mode 100644
index 0000000..0af003b
--- /dev/null
+++ b/bashrc/node/laptop/set-bell.sh
@@ -0,0 +1,2 @@
+setterm -blength 1
+setterm -bfreq 50