From a1ed6930eda36dc6300a490f5ca8f9c771c92615 Mon Sep 17 00:00:00 2001 From: c0dev0id Date: Sun, 21 May 2023 14:36:14 +0200 Subject: [PATCH] Update 2023-05-21 14:36 OpenBSD/amd64-x13 --- .bin/_config | 23 ++++++++++---------- .bin/dev-dirs | 29 ++++++++++++++----------- .bin/dexec_browser | 42 ++++++++++++++++++------------------- .bin/portjump | 23 +++++++++----------- .mutt/mailcap | 1 + .mutt/scripts/portpatch2.sh | 7 ++----- 6 files changed, 62 insertions(+), 63 deletions(-) diff --git a/.bin/_config b/.bin/_config index 01cb396..8b94253 100644 --- a/.bin/_config +++ b/.bin/_config @@ -4,21 +4,17 @@ # # FONTS # -DFONT="FuraCodeNerdFont-13" -SFONT="FuraCodeNerdFont-11" -BFONT="FuraCodeNerdFont-16" -HFONT="FuraCodeNerdFont-24" +DFONT="-xos4-terminus-medium-r-normal--26-200-72-72-c-100-iso10646-1" +SFONT="-xos4-terminus-medium-r-normal--14-200-72-72-c-100-iso10646-1" +BFONT="-xos4-terminus-medium-r-normal--26-200-72-72-c-100-iso10646-1" +HFONT="-xos4-terminus-medium-r-normal--38-200-72-72-c-100-iso10646-1" # # TERMINALS # -# STERM="st -f -xos4-terminus-medium-r-normal--14-200-72-72-c-100-iso10646-1" -# BTERM="st -f -xos4-terminus-medium-r-normal--20-200-72-72-c-100-iso10646-1" -# HTERM="st -f -xos4-terminus-medium-r-normal--26-200-72-72-c-100-iso10646-1" - -STERM="st -f $SFONT" -BTERM="st -f $BFONT" -HTERM="st -f $HFONT" +STERM="st -f ${SFONT}" +BTERM="st -f ${BFONT}" +HTERM="st -f ${HFONT}" # # DMENU @@ -36,6 +32,10 @@ DMENURUN_CMD="dmenu_run $DMENUOPTS" # # DEVELOPMENT # + +[ ! -d "${HOME}/.dev" ] && mkdir "${HOME}/.dev" +[ ! -f "${HOME}/.dev/dir" ] && pwd > "${HOME}/.dev/dir" + DEVDIRPATH=${HOME}/.dev DEVDIR="$(cat "${DEVDIRPATH}/dir")" @@ -59,4 +59,3 @@ export GPG_AGENT_INFO="$HOME/.gnupg/S.gpg-agent:0:1" export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) export SSH_AUTH_SOCK_EXTRA=${SSH_AUTH_SOCK%%.ssh}.extra gpg-connect-agent /bye - diff --git a/.bin/dev-dirs b/.bin/dev-dirs index 81502b7..5f2a833 100755 --- a/.bin/dev-dirs +++ b/.bin/dev-dirs @@ -4,18 +4,23 @@ cd /usr/ports [ ! -z "$1" ] && EXTRA="-q $1" -_list=$(find \ - /usr/ports/*/* \ - /usr/ports/mystuff/*/* \ - /usr/ports/openbsd-wip/*/* \ - /usr/src \ - /usr/xenocara \ - /usr/ports \ - /usr/src/*/* \ - /usr/xenocara/*/* \ +_ports=$(find \ + /usr/ports/* \ + /usr/ports/mystuff/* \ + /usr/ports/openbsd-wip/* \ -type d \ - -maxdepth 0 \ + -maxdepth 1 \ | grep -v -E distfiles\|pobj\|plist\|CVS) -echo "$_list\n/usr/src\n/usr/ports\n/usr/www\n/usr/xenocara" \ - | fzf $EXTRA -e -i -0 -1 --preview "tree {1}" +_sys=$(find /usr/src/* /usr/src/sys/* -type d -maxdepth 0 \ + | grep -v -E distfiles\|pobj\|plist\|CVS) + +_system=\ +"/usr/src +/usr/src/sys +/usr/xenocara +/usr/www +/usr/ports" + +echo "$_ports\n$_system\n$_sys" \ + | sort -u | fzf $EXTRA -e -i -0 -1 --preview "cat {1}/Makefile" diff --git a/.bin/dexec_browser b/.bin/dexec_browser index ff4a5ee..230435b 100755 --- a/.bin/dexec_browser +++ b/.bin/dexec_browser @@ -132,27 +132,27 @@ choose_browser() { gopher://*) DEFAULT="Lagrange (default)"; ;; gemini://*) DEFAULT="Lagrange (default)"; ;; *.pdf|*.cb|*.ps) DEFAULT="Zathura (default)"; ;; - 192.168.*) DEFAULT="Chrome (default)"; ;; - *github.com*) DEFAULT="Chrome (default)"; ;; - *amazon.de*) DEFAULT="Chrome (default)"; ;; - *twitter.com*) DEFAULT="Chrome (default)"; ;; - *chaos.social*) DEFAULT="Chrome (default)"; ;; - *hetzner.cloud*) DEFAULT="Chrome (default)"; ;; - *hetzner.de*) DEFAULT="Chrome (default)"; ;; - *duckduckgo.com/*images*) DEFAULT="Chrome (default)"; ;; - *codevoid.de*) DEFAULT="Chrome (default)"; ;; - *google.*) DEFAULT="Chrome (default)"; ;; - *youtube.com*) DEFAULT="Chrome (default)"; ;; - *youtu.be*) DEFAULT="Chrome (default)"; ;; - *bsd.network*) DEFAULT="Chrome (default)"; ;; - *itch.io*) DEFAULT="Chrome (default)"; ;; - *chat.uugrn.org*) DEFAULT="Chrome (default)"; ;; - *[./]amazon.*) DEFAULT="Chrome (default)"; ;; - *comdirect.de*) DEFAULT="Chrome (default)"; ;; - *motorradfreunde-rheinneckar.de*) DEFAULT="Chrome (default)"; ;; - *polo-motorrad.com*) DEFAULT="Chrome (default)"; ;; - *peek-cloppenburg.de*) DEFAULT="Chrome (default)"; ;; - *asos.com*) DEFAULT="Chrome (default)"; ;; + 192.168.*) DEFAULT="Firefox (default)"; ;; + *github.com*) DEFAULT="Firefox (default)"; ;; + *amazon.de*) DEFAULT="Firefox (default)"; ;; + *twitter.com*) DEFAULT="Firefox (default)"; ;; + *chaos.social*) DEFAULT="Firefox (default)"; ;; + *hetzner.cloud*) DEFAULT="Firefox (default)"; ;; + *hetzner.de*) DEFAULT="Firefox (default)"; ;; + *duckduckgo.com/*images*) DEFAULT="Firefox (default)"; ;; + *codevoid.de*) DEFAULT="Firefox (default)"; ;; + *google.*) DEFAULT="Firefox (default)"; ;; + *youtube.com*) DEFAULT="Firefox (default)"; ;; + *youtu.be*) DEFAULT="Firefox (default)"; ;; + *bsd.network*) DEFAULT="Firefox (default)"; ;; + *itch.io*) DEFAULT="Firefox (default)"; ;; + *chat.uugrn.org*) DEFAULT="Firefox (default)"; ;; + *[./]amazon.*) DEFAULT="Firefox (default)"; ;; + *comdirect.de*) DEFAULT="Firefox (default)"; ;; + *motorradfreunde-rheinneckar.de*) DEFAULT="Firefox (default)"; ;; + *polo-motorrad.com*) DEFAULT="Firefox (default)"; ;; + *peek-cloppenburg.de*) DEFAULT="Firefox (default)"; ;; + *asos.com*) DEFAULT="Firefox (default)"; ;; *zalando.de*) DEFAULT="Chrome (default)"; ;; *) DEFAULT="Chrome (default)"; ;; esac diff --git a/.bin/portjump b/.bin/portjump index 04c3a39..8b36e50 100755 --- a/.bin/portjump +++ b/.bin/portjump @@ -5,21 +5,18 @@ then exit 0 fi -_mystuff=$(find /usr/ports/mystuff /usr/ports/openbsd-wip \ - -mindepth 2 \ - -maxdepth 2 \ - -type d \ - -not \ - -path "*/.git*" \ - -not \ - -path "*/CVS*" \ - | sed 's|/usr/ports/||') +cd /usr/ports -_ports=$(echo "SELECT PkgPath from Paths;" \ - | sqlite3 /usr/local/share/sqlports \ - | sort -u) +_ports=$(find \ + * \ + mystuff/* \ + openbsd-wip/* \ + -type d \ + -maxdepth 1 \ + | grep -v -E distfiles\|pobj\|plist\|CVS) -printf '%s\n%s\n' "$_mystuff" "$_ports" \ + +print "$_ports" \ | fzf -e -i -0 -1 +s \ --query "$1" \ --preview='portinfo {}' diff --git a/.mutt/mailcap b/.mutt/mailcap index df6eb61..babc409 100644 --- a/.mutt/mailcap +++ b/.mutt/mailcap @@ -50,3 +50,4 @@ application/ms-tnef; tnef -w %s # fallback application/*; vim %s; needsterminal; text/*; cat %s; copiousoutput; +message/rfc822; emldump -a %s; copiousoutput; diff --git a/.mutt/scripts/portpatch2.sh b/.mutt/scripts/portpatch2.sh index 2cc3267..ab99f47 100755 --- a/.mutt/scripts/portpatch2.sh +++ b/.mutt/scripts/portpatch2.sh @@ -26,11 +26,8 @@ esac printf "Strip? [0]: " read -r _strip -echo "DIR: $(pwd)" echo "CMD: ${_catcmd} "${1}" | doas -u sdk patch -E -pp${_strip:=0} -d ${_path}" -sleep 1 && print 3 -sleep 1 && print 2 -sleep 1 && print 1 +sleep 1 -${_catcmd} "${1}" | doas -u sdk patch -E -p${_strip:=0} -d ${_path} +${_catcmd} "${1}" | doas -u sdk patch -E -N -p${_strip:=0} -d ${_path} cd ${_path} && doas su