From c8a559f5819eddcdcd3f0db5b2219209ac3e8c9e Mon Sep 17 00:00:00 2001
From: c0dev0id <sh+git@codevoid.de>
Date: Sat, 21 Jan 2023 11:09:30 +0100
Subject: [PATCH] Update 2023-01-21 11:09         OpenBSD/amd64

---
 .bin/netrestart |  1 +
 .kshrc          | 11 ++++++-----
 .vim/vimrc      |  9 ++++++---
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.bin/netrestart b/.bin/netrestart
index cd5c1d7..b06103c 100755
--- a/.bin/netrestart
+++ b/.bin/netrestart
@@ -1,4 +1,5 @@
 #!/bin/sh -x
+doas ifconfig trunk1 destroy
 doas ifconfig trunk0 destroy
 doas sh /etc/netstart
 doas rcctl restart resolvd
diff --git a/.kshrc b/.kshrc
index 7ab6a97..df9c63c 100644
--- a/.kshrc
+++ b/.kshrc
@@ -55,10 +55,6 @@ HISTFILE=$HOME/.ksh-history
 HISTSIZE=2000
 export HISTCONTROL HISTFILE HISTSIZE
 
-### CDPATH
-CDPATH=.:/usr/ports:~/code
-export CDPATH
-
 ### SOFTWARE PREFERENCES
 EDITOR="vim"
 VISUAL="vim"
@@ -325,6 +321,11 @@ CVSROOT=sdk@cvs.openbsd.org:/cvs
 alias cvs-diff="cvs -d $CVSROOT diff -uNp"
 alias cvs-commit="doas cvs -d $CVSROOT commit"
 alias cvs-update="doas cvs -z 1 -d $CVSROOT -q up -Pd -A"
+cvs-update-all() {
+    for p in ports src xenocara www; do
+        cd /usr/$p && cvs-update;
+    done
+}
 alias cvs-release="cvs -d $CVSROOT release"
 alias cvs-checkout="doas cvs -z 1 -qd $CVSROOT checkout -P"
 cvs-import-simulate() {
@@ -340,7 +341,7 @@ portclean() {(
 )}
 pmark() { pwd > /var/cache/pmark; }
 p()  { cd "$(</var/cache/pmark)"; }
-pj() { cd "$(port jump $1)"; }
+pj() { cd "/usr/ports/$(portjump $1)"; }
 po() { cd "$(</var/cache/pmark)" && cd "$(make show=WRKSRC)"; }
 alias portsweep='doas find . \( -name "*.orig" -or -empty \) -delete'
 pdiff() {(
diff --git a/.vim/vimrc b/.vim/vimrc
index 9a3a7cc..64d6002 100644
--- a/.vim/vimrc
+++ b/.vim/vimrc
@@ -198,9 +198,12 @@ set statusline=%#VisualNOS#
 set statusline+=%F\ (%{&filetype})
 set statusline+=%=
 set statusline+=%m%r%h%w%q
-set statusline+=\ %{&fileformat}/%{&fileencoding?&fileencoding:&encoding}
-set statusline+=\ %b/0x%B
-set statusline+=\ %c\ %p%%
+set statusline+=\ (%{&fileformat}/%{&fileencoding?&fileencoding:&encoding})
+set statusline+=\ (%b/0x%B)
+set statusline+=\ (%{(mode()=='V')?wordcount().visual_words:wordcount().words}w
+set statusline+=/%{(mode()=='V')?wordcount().visual_chars:wordcount().chars}c)
+set statusline+=\ (%ly/%cx)
+set statusline+=\ %p%%
 set statusline+=\ 
 
 " ITALIC FIX