commit b6697b9c0117a6d528281b8caac7e99535210a6f
parent 6a4b675621ada30ace86c43da5472111d4cf2643
Author: Jacob R. Edwards <jacobouno@protonmail.com>
Date: Tue, 24 Aug 2021 00:15:32 -0700
Do away with rc history
Using tee works to some extent but causes password reading to fail
aswell as EOF be sent to all children. I patched my rc to record
history (hence the 'history' variable) but it will unfortunately,
for now, not be available here.
Additionally 9term always invokes a login shell because for some
reason function definitions don't persist from the xsession script
Diffstat:
5 files changed, 6 insertions(+), 21 deletions(-)
diff --git a/local/bin/.local/bin/9term b/local/bin/.local/bin/9term
@@ -1,14 +1,6 @@
#!/bin/sh
# Copyright 2021 Jacob R. Edwards
# License: GPLv3
-# 9term which doesn't pass extra flags to SHELL
-#
-# While this is an issue with rc, not 9term, "fixing" rc with a
-# shell script would be terrible and I don't want to force myself
-# (and other people I suppose) to run a patched rc.
-#
-# What reason there is for raising an error if the same flag is
-# passed twice is beyond me, maybe it's a genius plan9 thing.
+# Login terminal
-
-exec 9 9term "${@:-${SHELL:-rc}}"
+exec 9 9term -l "$@"
diff --git a/local/bin/.local/bin/rcl b/local/bin/.local/bin/rcl
@@ -1,8 +0,0 @@
-#!/bin/sh -a
-# Copyright 2021 Jacob R. Edwards
-# License: GPLv3
-# Interactive rc shell with input history and such
-
-history="${history:-$HOME/lib/history}"
-
-tee -a "$history" | exec "${PLAN9:-/usr/local/plan9}/bin/rc" -i "$@"
diff --git a/local/ksh/.profile b/local/ksh/.profile
@@ -9,7 +9,7 @@ export CC=tcc
export EDITOR=sam
export LOCKER=slock
export PAGER=cat
-export SHELL=rcl
+export SHELL=rc
export TERMINAL=9term
export VISUAL=$EDITOR
diff --git a/local/rc/lib/profile b/local/rc/lib/profile
@@ -8,7 +8,7 @@ CC = tcc
EDITOR = sam
LOCKER = slock
PAGER = cat
-SHELL = rcl
+SHELL = rc
TERMINAL = 9term
VISUAL = $EDITOR
@@ -29,6 +29,7 @@ path = ($home/local/bin /bin /sbin /usr/bin /usr/sbin /usr/local/bin\
font = $PLAN9/font/misc/unicode.6x13.font
dirlog = $XDG_DATA_HOME/cd
prompt = '; '
+history = $home/lib/history
# cd
fn cd { builtin cd $* && pwd >>$dirlog }
diff --git a/local/xenodm/.config/xsession b/local/xenodm/.config/xsession
@@ -10,4 +10,4 @@ bg xbanish
bg xmodmap "${XDG_CONFIG_HOME:-$HOME/.config}/xmodmaprc"
bg xrdb -load "${XDG_CONFIG_HOME:-$HOME/.config}/Xresources"
bg xset dpms 360 600 960 r rate 250 30 s 0 b 0 0 0 m 3 1
-exec rc -lc "dwm >[1=2] >'${XDG_DATA_HOME:-$HOME/.local/share}/dwm'"
+exec dwm 1>&2 >"${XDG_DATA_HOME:-$HOME/.local/share}/dwm"
