make nicer

trinitystuff/sh/aliases

@@ -30,11 +30,6 @@ pyenv() {
 alias sensors="watch sensors"
 alias sudo="$SUDO"
 alias try="PREFIX=/home/trinity/src/trilsd/ /home/trinity/src/trilsd/dist/try"
-
-# Wacom Intuos 2
-#alias taboff="xsetwacom set 'Wacom Intuos2 6x8 Pen stylus' MapToOutput LVDS-1"
-#alias tabon="xsetwacom set 'Wacom Intuos2 6x8 Pen stylus' MapToOutput VGA-1"
-
 alias units="units --history /dev/null"
 alias v="$VISUAL"
 alias weather="curl wttr.in/lewiston+maine?m"

trinitystuff/sh/env

@@ -1,10 +1,14 @@
-if [ "$0" = "bash" ] || [ "$0" = "-bash" ]; then complete -c man which; fi
+set -o vi
+
+test "$0" = bash || test "$0" = -bash \
+	&& complete -c man which \
+	|| true
 
 PS1="; "
 PS2=";   "
 PS3=";     "
 
-set -o vi
+test -e "$HOME/.aliases" \
-
+	&& . $HOME/.aliases
-. $HOME/.aliases
+test -e "$HOME/.cargo/env" \
-. $HOME/.cargo/env
+	&& . $HOME/.cargo/env

trinitystuff/sh/profile

@@ -1,7 +1,8 @@
 BROWSER=firefox; export BROWSER
-EDITOR=/usr/lib/plan9/bin/ed; export EDITOR
+test -f /usr/lib/plan9 && PLAN9=/usr/lib/plan9
-PAGER="less"; export PAGER
+test -f /usr/local/plan9 && PLAN9=/usr/local/plan9
-PLAN9=/usr/local/plan9; export PLAN9
+export PLAN9
+EDITOR="$PLAN9/bin/sam -d"; export EDITOR
 PATH="\
 /bin:\
 /sbin:\
@@ -15,9 +16,11 @@ PATH="\
 /usr/pkg/qt5/bin:\
 /usr/X11R7/bin:\
 $HOME/bin/:\
-$PLAN9/bin"; export PATH
+$PLAN9/bin:\
-TERMINAL="uxterm"; export TERMINAL
+$PATH"; export PATH
-UNITS_SYSTEM="si"; export UNITS_SYSTEM
+PAGER="less"; export PAGER
+TERMINAL=uxterm; export TERMINAL
+UNITS_SYSTEM=si; export UNITS_SYSTEM
 VISUAL=vi; export VISUAL
 WALLPAPER="$HOME/Pictures/Wallpapers/ghibli_wars.jpg"; export WALLPAPER