From d4c83cd571103d5ee881ce938b18d9a5c7c92ba2 Mon Sep 17 00:00:00 2001 From: c0dev0id Date: Sun, 19 Nov 2023 08:40:50 +0100 Subject: [PATCH] Update 2023-11-19 08:40 OpenBSD/amd64-x13 --- .bin/_config | 14 +++++--------- .bin/chrome | 3 ++- .bin/dexec_browser | 10 ++++------ .bin/dexec_man | 26 ++++++++++++++++++++------ .bin/dexec_man.orig | 23 ----------------------- .bin/documents-import | 2 +- .bin/nnn.sh | 1 + .bin/obsdmake | 2 +- .gnupg/pinentry-dmenu.conf | 2 +- .kshrc | 6 +++--- .notion/cfg_notioncore.lua | 3 +++ .notion/look_codevoid.lua | 4 ++-- 12 files changed, 43 insertions(+), 53 deletions(-) delete mode 100755 .bin/dexec_man.orig diff --git a/.bin/_config b/.bin/_config index 400d5a3..0cc7e66 100644 --- a/.bin/_config +++ b/.bin/_config @@ -2,9 +2,9 @@ # FONTS # -SFONT="JetBrainsMono-11" -BFONT="IosevkaTermNerdFont-18" -HFONT="IosevkaTermNerdFont-24" +SFONT="Cozette:pixelsize=13" +BFONT="CozetteHiDpi:pixelsize=26" +HFONT="LuxiMono-24" # TERMINALS # @@ -15,16 +15,12 @@ HTERM="st -f ${HFONT}" MICROFONT="-uw-ttyp0-medium-r-normal--13-150-75-75-c-80-iso10646-1" MICROTERM="st -f ${MICROFONT}" -#STERM="zutty -fontpath ~/.fonts -font FuraCodeNerdFont -fontsize 12" -#BTERM="zutty -fontpath ~/.fonts -font FuraCodeNerdFont -fontsize 18" -#HTERM="zutty -fontpath ~/.fonts -font FuraCodeNerdFont -fontsize 24" - # DMENU # -DFONT="JetBrainsMono-11" +DFONT="Cozette:pixelsize=13" # NOTION ORANGE -DMENUOPTS="-fn '$DFONT' -nb #181818 -nf #707070 -sf #FFA600 -sb #222222 -l 20 -i -f" +DMENUOPTS="-fn '$DFONT' -nb #181818 -nf #404040 -sf #FFA600 -sb #222222 -l 18 -i -f" # BSPWM # DMENUOPTS="-fn '$DFONT' -nb #222222 -nf #707070 -sf #CCCCCC -sb #222222 -i -f" diff --git a/.bin/chrome b/.bin/chrome index c12c177..f3550e3 100755 --- a/.bin/chrome +++ b/.bin/chrome @@ -1,6 +1,7 @@ #!/bin/sh -/usr/local/bin/chrome \ +/usr/local/bin/ungoogled-chromium \ --bwsi \ + --enable-easy-off-store-extension-install \ --disable-3d-apis \ --disable-angle-features=allowETCFormats \ --disable-auto-reload \ diff --git a/.bin/dexec_browser b/.bin/dexec_browser index f9ae6c6..6bb7089 100755 --- a/.bin/dexec_browser +++ b/.bin/dexec_browser @@ -130,22 +130,19 @@ choose_browser() { *hetzner.cloud*) DEFAULT="Chrome (default)"; ;; *hetzner.de*) DEFAULT="Vimb (default)"; ;; *duckduckgo.com/*images*) DEFAULT="Vimb (default)"; ;; - *codevoid.de*) DEFAULT="Vimb (default)"; ;; - *openbsd.org*) DEFAULT="Vimb (default)"; ;; - *google.*) DEFAULT="Firefox (default)"; ;; *youtube.com/watch*) DEFAULT="Mpv (default)"; ;; *media.ccc.de/v/*) DEFAULT="Mpv (default)"; ;; *bsd.network*) DEFAULT="Chrome (default)"; ;; *itch.io*) DEFAULT="Firefox (default)"; ;; *chat.uugrn.org*) DEFAULT="Firefox (default)"; ;; *[./]amazon.*) DEFAULT="Chrome (default)"; ;; - *comdirect.de*) DEFAULT="Firefox (default)"; ;; + *comdirect.de*) DEFAULT="Chrome (default)"; ;; *.pdf|*.cb|*.ps) DEFAULT="Zathura (default)"; ;; *.mp4|*.m4v|*.mkv) DEFAULT="Mpv (default)"; ;; - *) DEFAULT="$BROWSER (default)"; ;; + *) DEFAULT="Chrome (default)"; ;; esac - local S="${DEFAULT}\nLuakit\nVimb\nFirefox\nChrome\nQutebrowser\nNetsurf\nTor-Browser\nDillo\nSurf\nMpv" + local S="${DEFAULT}\nLuakit\nVimb\nFirefox\nChrome\nQutebrowser\nWyeb\nNetsurf\nTor-Browser\nDillo\nSurf\nMpv" case $(echo "${S}" | ${DMENU_CMD} -p "Browser") in [Nn]etsurf*) BROWSER=netsurf-gtk3 ;; [Vv]imb*) BROWSER=vimb; ;; @@ -159,6 +156,7 @@ choose_browser() { [Tt]or-B*r*) BROWSER=tor-browser ;; [Zz]athura*) BROWSER=zathura ;; [Ll]agrange*) BROWSER=lagrange ;; + [Ww]yeb*) BROWSER=wyeb ;; [Mm]pv*) export _SWM_WS=-1; BROWSER="mpv" ;; *) exit 0;; esac diff --git a/.bin/dexec_man b/.bin/dexec_man index 74ee04f..9e20592 100755 --- a/.bin/dexec_man +++ b/.bin/dexec_man @@ -1,10 +1,24 @@ #!/bin/sh . $HOME/.bin/_config -MAN="$(for i in $(jot 9 1); do man -s $i -k . | awk -v i=$i -F"(" '{ gsub(", ","\n"i"-",$1); print i"-"$1}'; done | while IFS= read -r l; do echo "${#l} $((++n)) $l"; done | sort -n -k 1 | cut -d" " -f3- | $DMENU_CMD -p "Manpage")" +MAN1=$(man -s1 -k .) +MAN2=$(man -s2 -k .) +MAN3=$(man -s3 -k .) +MAN3P=$(man -s3p -k .) +MAN4=$(man -s4 -k .) +MAN5=$(man -s5 -k .) +MAN6=$(man -s6 -k .) +MAN7=$(man -s7 -k .) +MAN8=$(man -s8 -k .) +MAN9=$(man -s9 -k .) -if [ ! -z "$MAN" ]; then - M="$(printf '%s' "$MAN" | cut -d"-" -f2)" - S="$(printf '%s' "$MAN" | cut -d"-" -f1)" - bterm -e man -s "$S" "$M" -fi +SEL=$(echo "$MAN1" "$MAN2" "$MAN3" "$MAN4" \ + "$MAN5" "$MAN6" "$MAN7" "$MAN8" \ + "$MAN9" "$MAN3P" | $DMENU_CMD -p "Man") + +[ -z "$SEL" ] && exit 0 + +N=$(echo "$SEL" | cut -d"(" -f2 | cut -d")" -f1) +M=$(echo "$SEL" | cut -d"(" -f1 | cut -d"," -f1) + +bterm -e man -s $N $M diff --git a/.bin/dexec_man.orig b/.bin/dexec_man.orig deleted file mode 100755 index ed6777b..0000000 --- a/.bin/dexec_man.orig +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -. $HOME/.bin/_config - -MAN1=$(man -s 1 -k . | awk -F" - " '{print $1}' | awk -F"(" '{print $1}' | tr -d ' ' | tr ',' '\n' | awk -F"(" '{print "1-"$1}') -MAN2=$(man -s 2 -k . | awk -F" - " '{print $1}' | awk -F"(" '{print $1}' | tr -d ' ' | tr ',' '\n' | awk -F"(" '{print "2-"$1}') -MAN3=$(man -s 3 -k . | awk -F" - " '{print $1}' | awk -F"(" '{print $1}' | tr -d ' ' | tr ',' '\n' | awk -F"(" '{print "3-"$1}') -MAN4=$(man -s 4 -k . | awk -F" - " '{print $1}' | awk -F"(" '{print $1}' | tr -d ' ' | tr ',' '\n' | awk -F"(" '{print "4-"$1}') -MAN5=$(man -s 5 -k . | awk -F" - " '{print $1}' | awk -F"(" '{print $1}' | tr -d ' ' | tr ',' '\n' | awk -F"(" '{print "5-"$1}') -MAN6=$(man -s 6 -k . | awk -F" - " '{print $1}' | awk -F"(" '{print $1}' | tr -d ' ' | tr ',' '\n' | awk -F"(" '{print "6-"$1}') -MAN7=$(man -s 7 -k . | awk -F" - " '{print $1}' | awk -F"(" '{print $1}' | tr -d ' ' | tr ',' '\n' | awk -F"(" '{print "7-"$1}') -MAN8=$(man -s 8 -k . | awk -F" - " '{print $1}' | awk -F"(" '{print $1}' | tr -d ' ' | tr ',' '\n' | awk -F"(" '{print "8-"$1}') -MAN9=$(man -s 9 -k . | awk -F" - " '{print $1}' | awk -F"(" '{print $1}' | tr -d ' ' | tr ',' '\n' | awk -F"(" '{print "9-"$1}') - -MAN=$(printf '%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n' \ - "$MAN1" "$MAN2" "$MAN3" "$MAN4" "$MAN5" "$MAN6" "$MAN7" "$MAN8" "$MAN9" \ - | $DMENU_CMD -p "Manpage") - -if [ ! -z "$MAN" ]; then - M="$(printf '%s' "$MAN" | cut -d"-" -f2)" - S="$(printf '%s' "$MAN" | cut -d"-" -f1)" - bterm -e man -s $S $M - -fi diff --git a/.bin/documents-import b/.bin/documents-import index 23c1305..50cfd4f 100755 --- a/.bin/documents-import +++ b/.bin/documents-import @@ -1,7 +1,7 @@ #/bin/sh -xe . ${HOME}/.bin/_config -pkg_add tesseract tesseract-deu ocrmypdf +doas pkg_add tesseract tesseract-deu ocrmypdf mkdir -p ${PIMDIR}/documents/_incoming mv -f /tank/scanner/*.pdf ${PIMDIR}/documents/_incoming/ diff --git a/.bin/nnn.sh b/.bin/nnn.sh index 1726597..f6b8266 100755 --- a/.bin/nnn.sh +++ b/.bin/nnn.sh @@ -67,6 +67,7 @@ case "$EXT" in m2ts) mpv "$f"; ;; sid) sidplay "$f"; ;; out) kdump -RTf "$f" | less; ;; + torrent) aria2c "$f"; ;; *) unset EXT; ;; esac diff --git a/.bin/obsdmake b/.bin/obsdmake index 4f56645..3d4a214 100755 --- a/.bin/obsdmake +++ b/.bin/obsdmake @@ -15,7 +15,7 @@ export LLVM_CCACHE_DIR="/var/ccache" export CMAKE_CXX_COMPILER_LAUNCHER="ccache" export CMAKE_C_COMPILER_LAUNCHER="ccache" -FLAGS="-fno-stack-protector -fno-ret-protector -mno-retpoline -O3 -pipe -march=native -mmmx -msse -msse2 -msse3 -msse4 -m3dnow " +FLAGS="-fno-stack-protector -fno-ret-protector -mno-retpoline -march=native" export CC="/opt/ccache/bin/cc $FLAGS" export CXX="/opt/ccache/bin/c++ $FLAGS" diff --git a/.gnupg/pinentry-dmenu.conf b/.gnupg/pinentry-dmenu.conf index 2d988b8..21130c8 100644 --- a/.gnupg/pinentry-dmenu.conf +++ b/.gnupg/pinentry-dmenu.conf @@ -1,6 +1,6 @@ asterisk = "*"; prompt = ""; -font = "FuraCodeNerdFont-13"; +font = "JetBrainsMono-10"; bottom = false; prompt_fg = "#FFFFFF"; diff --git a/.kshrc b/.kshrc index fb51d6a..513e581 100644 --- a/.kshrc +++ b/.kshrc @@ -27,16 +27,15 @@ export PATH ### LANGUAGE LANG=en_US.UTF-8 -LC_ALL=en_US.UTF-8 LC_MESSAGES=C LC_NUMERIC=C -LC_TIME=en_US.UTF-8 +LC_TIME=de_DE.UTF-8 export LANG LC_ALL LC_MESSAGES LC_NUMERIC LC_TIME ### SOFTWARE PREFERENCES EDITOR="vim" VISUAL="vim" -BROWSER=vimb +BROWSER=chrome PAGER="less" export EDITOR VISUAL BROWSER PAGER @@ -434,6 +433,7 @@ portclean() {( cd /usr/ports doas rm -rf pobj/* plist logs packages bulk update distfiles/* mkdir -p plist logs packages bulk update + doas chown -R sdk:_pbuild /usr/ports/ doas make fix-permissions )} pmark() { pwd > /var/cache/pmark; } diff --git a/.notion/cfg_notioncore.lua b/.notion/cfg_notioncore.lua index 42786c3..7631260 100644 --- a/.notion/cfg_notioncore.lua +++ b/.notion/cfg_notioncore.lua @@ -100,6 +100,9 @@ defbindings("WMPlex.toplevel", { bdoc("Query for mailbox to open"), kpress(META.."Shift+M", "ioncore.exec_on(_, 'dexec_mail')"), + bdoc("Query for VPN to connect to"), + kpress(META.."V", "ioncore.exec_on(_, 'dexec_vpn')"), + bdoc("Run a small terminal emulator."), kpress(META.."Return", "ioncore.exec_on(_, 'sterm')"), diff --git a/.notion/look_codevoid.lua b/.notion/look_codevoid.lua index 5abb351..9795a63 100644 --- a/.notion/look_codevoid.lua +++ b/.notion/look_codevoid.lua @@ -13,7 +13,7 @@ de.defstyle("*", { highlight_pixels = 1, shadow_pixels = 1, border_style = "elevated", - font = "xft:FuraCodeNerdFont:size=9", + font = "xft:Cozette:pixelsize=13", text_align = "center", }) @@ -93,7 +93,7 @@ de.defstyle("stdisp", { shadow_pixels = 0, highlight_pixels = 0, text_align = "left", - font = "xft:FuraCodeNerdFont:size=9", + font = "xft:Cozette:pixelsize=13", background_colour = "#222222", de.substyle("important", {