Use vi and less

I haven't used neovim in a couple weeks by now, so I may as well
commit this.

2 files changed, 8 insertions, 7 deletions

diff --git a/home/.profile b/home/.profile
index 90a7d6e0..e6f75db3 100644
--- a/home/.profile
+++ b/home/.profile
@@ -6,14 +6,15 @@ for prefix in '' /usr/local /opt/local /usr ~/.local; do
 done
 path /usr/games
 
+export EDITOR=vi
+type nvi >/dev/null && EDITOR=nvi
+export EXINIT='set ai ic sm sw=4 ts=4 | map gg 1G'
 export PAGER=less
 export LESS=FRXix4
-export EXINIT='set ai ic sm sw=4 ts=4 | map gg 1G'
-export EDITOR=nvim
-export MANPAGER='nvim +Man!'
-export MANSECT=2:3:1:8:6:5:7:4:9
 export CLICOLOR=1
-export GPG_TTY=$(tty)
+export MANSECT=2:3:1:8:6:5:7:4:9
+export LESS_TERMCAP_us=$(tput sitm)
+export LESS_TERMCAP_ue=$(tput ritm)
 export NETHACKOPTIONS='pickup_types:$!?+/=, color, DECgraphics'
 
 [ -e /usr/share/mk/sys.mk ] || export CFLAGS=-O
diff --git a/home/.shrc b/home/.shrc
index bf3e0dfe..df980428 100644
--- a/home/.shrc
+++ b/home/.shrc
@@ -2,7 +2,7 @@ set -o noclobber -o nounset -o vi
 
 CDPATH=:~
 
-alias vim=$EDITOR
+alias vi=$EDITOR vim=$EDITOR
 alias ls='LC_COLLATE=C ls -p'
 alias ll='ls -hl'
 alias bc='bc -l'
@@ -14,7 +14,7 @@ alias gc='git commit' gca='gc --amend' gt='git tag'
 alias gp='git push' gu='git pull' gf='git fetch' gr='git rebase'
 alias rand='openssl rand -base64 33'
 alias private='eval "$(gpg -d ~/.private)"'
-type doas >/dev/null 2>&1 && alias sudo=doas
+type doas >/dev/null && alias sudo=doas
 
 cd() {
 	local path