commit bff7a87e263a0148566ef2be7e71f62294ce1afc
parent 4bfdf8a892b27a084802944c10d2678253d3cec6
Author: Jacob R. Edwards <n/a>
Date: Sun, 13 Mar 2022 22:09:56 -0700
Switch back to ksh, vi, etc.
Recently, I'v been spending a non-trivial amount of time managing
a remote UNIX system. Using 9term and sam, as much as I'v enjoyed
using them, is just not practical in those circumstances.
Diffstat:
5 files changed, 84 insertions(+), 85 deletions(-)
diff --git a/local/Makefile b/local/Makefile
@@ -4,6 +4,7 @@ mods =\
bin\
dillo\
git\
+ ksh\
links\
mail\
netquery\
@@ -11,11 +12,10 @@ mods =\
src\
ssh\
sxiv\
+ vi\
xenodm\
xmodmap\
xresources\
-# ksh\
# tmux\
-# vi\
.include "${lib}/module.make"
diff --git a/local/ksh/.profile b/local/ksh/.profile
@@ -1,33 +1,75 @@
# ksh profile
-# disallow core dumps
-ulimit -Sc 0
-
-# defaults
-export BROWSER=www
-export CC=tcc
-export EDITOR=sam
-export LOCKER=slock
-export PAGER=cat
-export SHELL=rc
-export TERMINAL=9term
-export VISUAL=$EDITOR
-
-# xdg
-export XDG_CACHE_HOME="$HOME/local/cache/"
-export XDG_CONFIG_HOME="$HOME/config/"
-export XDG_DATA_HOME="$HOME/local/share/"
-
-# make(1)
-export MAKEFLAGS=-e
-export MANPREFIX=/usr/local/man/
-export PREFIX=/usr/local/
-
-# etc
-export ENV="$XDG_CONFIG_HOME/kshrc"
-export LESS='-2MSWXiqrx~ -b80 -h15 -z23 -j5 -x8'
-export LESSHISTFILE=/dev/null
-export MANPATH=/usr/share/man:/usr/X11R6/man:/usr/local/man
-export PLAN9=/usr/local/plan9/
-export PATH="$HOME/bin:$HOME/local/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/usr/X11R6/bin:/usr/games:$PLAN9/bin:$PLAN9/bin/fs"
-export font=$PLAN9/font/misc/unicode.6x13.font
+set -Xa -o vi
+unalias -a
+biff y
+
+IFS='
+'
+PATH=.:"$HOME"/bin:"$PATH"
+
+CC=tcc
+PAGER=less
+BROWSER=links
+
+XDG_CACHE_HOME="$HOME"/var/cache
+XDG_CONFIG_HOME="$HOME"/config
+XDG_DATA_HOME="$HOME"/sys/data
+
+MAKEFLAGS=-e
+MANPREFIX=/usr/local/man
+PREFIX=/usr/local
+
+# Some programs don't respect TERM, some don't recognize VISUAL,
+# this should be fool-proof.
+case "$TERM" in
+(dumb)
+ EDITOR=ed ;;
+(*)
+ EDITOR=vi ;;
+esac
+
+g() git "$@"
+r() fc -s "$@"
+h() { fc -ln | fgrep -e "${1:-}"; }
+f() "$EDITOR" "$@"
+
+# Operating System Specific
+case "$(uname)" in
+(OpenBSD)
+ PATH="$PATH":/usr/games
+ pa() doas pkg_add -x "$@"
+ pd() doas pkg_delete -x "$@"
+ pf() pkg_locate "$@"
+ pi() pkg_info -q "$@"
+ pl() pkg_list "$@"
+ pr() pkg_root "$@"
+ pt() pkg_tree "$@"
+esac
+
+# Plan9port Specific
+if test -d /usr/local/plan9
+then
+ PLAN9=/usr/local/plan9
+ PATH="$PATH":"$PLAN9"/bin
+ font="$PLAN9"/font/fixed/unicode.7x13.font
+
+ # More attractive, but not uniform with unicode
+ #font="$PLAN9"/font/misc/unicode.6x13.font
+
+ ls() 9 ls "$@"
+ rm() 9 rm "$@"
+
+ # Startup "filesystems"
+ plumber
+else
+ lc() command ls -A "$@"
+ ls() command ls -1A "$@"
+ rm() command rm -d "$@"
+fi
+
+# Try and start aps
+aps && {
+ apc stop
+ shf < "$HOME"/music/playlists/general | apc add ^
+} 2>/dev/null
diff --git a/local/ksh/config/kshrc b/local/ksh/config/kshrc
@@ -1,52 +0,0 @@
-# ksh rc file
-
-set -Xabu -o vi -o physical -o pipefail
-
-HISTFILE="${XDG_DATA_HOME:-$HOME/.local/share}/ksh/$(date +%Y/%m)"
-HISTSIZE=820000
-PS1='\$ '
-PS2='2> '
-PS3='3> '
-PS4='4> '
-
-mkdir -p "$(dirname $HISTFILE)"
-
-wdlog="${XDG_DATA_HOME:-$HOME/.local/share}/cd"
-
-# cd
-cd() { builtin cd "$@" && echo "$PWD" >>"$wdlog" ;}
-cdl() { uniq <"$wdlog" | stest -d ;}
-cdr() cd "$(cdl | egrep "${@:-.}" | tail -1)"
-cds() cd "$(pwd | sed "s!$1!$2!g")"
-
-# history
-hl() cat "$HISTFILE"
-hs() { hl | egrep "$@"; }
-
-# OpenBSD package management
-pa() doas pkg_add "$@"
-pd() doas pkg_delete "$@"
-pdd() doas sh -c 'pkg_delete "$@" && pkg_delete -a' pdd "$@"
-pdp() pkg_depend "$@"
-pi() pkg_info -q "$@"
-plc() pkg_locate "${@:-.}"
-pli() portslist "$@"
-pr() pkgroot "$@"
-pt() pkgtree "$@"
-pu() doas pkg_add -u "$@"
-
-# simple
-curl() command curl -sS "$@"
-doas() command doas -- "$@"
-dsu() doas su "$@"
-fn() functions "$@"
-ls() 9 ls "$@"
-
-# short
-c() command "$@"
-d() doas "$@"
-e() egrep "$@"
-f() ${EDITOR:-vi} "$@"
-g() git "$@"
-l() ${PAGER:-less} "$@"
-t() tmux "$@"
diff --git a/local/xenodm/config/xsession b/local/xenodm/config/xsession
@@ -4,6 +4,9 @@
if (~ $#XDG_CONFIG_HOME 0)
XDG_CONFIG_HOME = $home/.config
+BROWSER = glinks
+TERMINAL = xterm
+
setbg &
xbanish &
xmodmap $XDG_CONFIG_HOME/xmodmap &
diff --git a/local/xresources/config/xresources b/local/xresources/config/xresources
@@ -2,3 +2,9 @@
Sxiv.background:#000000
Sxiv.foreground:#ffffff
+
+XTerm*loginShell: false
+XTerm*multiScroll: true
+XTerm*saveLines: 16000
+XTerm*scrollTtyOutput: false
+XTerm*initialFont: 6
