diff --git a/.bin/dev-dirs b/.bin/dev-dirs index a01760d..caef1f1 100755 --- a/.bin/dev-dirs +++ b/.bin/dev-dirs @@ -6,13 +6,13 @@ cd /usr/ports _ports=$(echo "SELECT PkgPath from Paths;" \ | sqlite3 /usr/local/share/sqlports \ - | sort -u) + | sort -u | sed 's,^,/usr/ports/,g') _list=$(find /usr/ports/mystuff/*/* /usr/src/*/* /usr/xenocara/*/* /usr/src /usr/xenocara /usr/ports -type d -maxdepth 0) -echo "$_ports" "$_list" "/usr/src" "/usr/ports" "/usr/www" "/usr/xenocara" \ +print "$_ports\n$_list\n/usr/src\n/usr/ports\n/usr/www\n/usr/xenocara" \ | grep -v "/CVS" \ | while IFS= read -r l; do echo "${#l} $((++n)) $l"; done \ - | sort -n \ + | sort -un \ | cut -d" " -f3- \ | fzf $EXTRA -e -i -0 -1 +s --preview "tree {1}" diff --git a/.bin/dexec_pim b/.bin/dexec_pim index 59ec8f7..fb23510 100755 --- a/.bin/dexec_pim +++ b/.bin/dexec_pim @@ -1,7 +1,7 @@ #!/bin/sh . $HOME/.bin/_config -SEL=$(printf "Notes\nDocuments\nContacts\nSlides" | $DMENU_CMD -p "Information System") +SEL=$(print "Notes\nDocuments\nContacts\nCalendar\nSlides" | $DMENU_CMD -p "Information System") case $SEL in Notes) @@ -26,16 +26,16 @@ case $SEL in fi ;; Contacts) - C=$(contactsearch | $DMENU_CMD -p Contacts -l 25) - if [ ! -z "$C" ]; then - _file=$(printf "$C" | cut -d" " -f1) - if [ -f "$PIMDIR/contacts/$_file" ]; then - texec "vim \"$PIMDIR/contacts/$_file\"" - else - printf "Name:\nAddress:\nHome:\nWork:\nMail:\nWeb:\nBirthday:\n" >> "$PIMDIR/contacts/$_file" - texec "vim \"$PIMDIR/contacts/$_file\"" - fi - fi + eval $(gnome-keyring-daemon --start --components=secrets) + dbus-update-activation-environment --all + export GNOME_KEYRING_CONTROL GNOME_KEYRING_SOCKET GNOME_KEYRING_PID + gnome-contacts + ;; + Calendar) + eval $(gnome-keyring-daemon --start --components=secrets) + dbus-update-activation-environment --all + export GNOME_KEYRING_CONTROL GNOME_KEYRING_SOCKET GNOME_KEYRING_PID + gnome-calendar ;; Slides) P=$(ls -1 "$PIMDIR/slides/" | sort -hr | $DMENU_CMD -p Slides -l 25) diff --git a/.bin/documents-grep b/.bin/documents-grep index 59106f9..89cf946 100755 --- a/.bin/documents-grep +++ b/.bin/documents-grep @@ -2,4 +2,4 @@ . ${HOME}/.bin/_config cd ${PIMDIR}/documents -pdfgrep --cache -H "${*}" *.pdf +pdfgrep --cache -n -H "${*}" *.pdf diff --git a/.bin/obsdmake b/.bin/obsdmake index 1b0a488..d82dc5f 100755 --- a/.bin/obsdmake +++ b/.bin/obsdmake @@ -3,19 +3,18 @@ umask 022 JOBS="${JOBS:=$(sysctl -n hw.ncpuonline)}" -export GLOBAL_AUTOCONF_CACHE="/var/ccache/config.cache" -export CCACHE_DIR="/var/ccache" -export CCACHE_SLOPPINESS="locale,time_macros,random_seed" - -# base llvm? -export LLVM_CCACHE_BUILD=1 -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 -march=native" -export CC="/opt/ccache/bin/cc $FLAGS" -export CXX="/opt/ccache/bin/c++ $FLAGS" +# export CCACHE_DIR="/var/ccache" +# export CCACHE_SLOPPINESS="locale,time_macros,random_seed" +# +# # base llvm? +# export LLVM_CCACHE_BUILD=1 +# 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 -march=native" +# export CC="/opt/ccache/bin/cc $FLAGS" +# export CXX="/opt/ccache/bin/c++ $FLAGS" if [ -z "$1" ]; then echo "Usage: ${0} [kernel, base, xenocara, release, all] [clean]" diff --git a/.bin/portjump b/.bin/portjump index 71da80d..04c3a39 100755 --- a/.bin/portjump +++ b/.bin/portjump @@ -5,7 +5,7 @@ then exit 0 fi -_mystuff=$(find /usr/ports/mystuff \ +_mystuff=$(find /usr/ports/mystuff /usr/ports/openbsd-wip \ -mindepth 2 \ -maxdepth 2 \ -type d \ diff --git a/.bin/sort-wantlib b/.bin/sort-wantlib index 818aaf4..5aee0e7 100755 --- a/.bin/sort-wantlib +++ b/.bin/sort-wantlib @@ -1,8 +1,6 @@ #!/bin/sh - cat | sed 's/^WANTLIB[[:blank:]+=]*//g' \ | tr ' ' '\n' \ | sort -u \ | fmt -w60 \ - | sed 's/^/WANTLIB += /g' - # | sed '1s/^WANTLIB += /WANTLIB = /' + | sed 's/^/WANTLIB += /g;1s/^WANTLIB += /WANTLIB = /' diff --git a/.gnupg/pinentry-dmenu.conf b/.gnupg/pinentry-dmenu.conf index 6edd42b..2d988b8 100644 --- a/.gnupg/pinentry-dmenu.conf +++ b/.gnupg/pinentry-dmenu.conf @@ -1,6 +1,6 @@ asterisk = "*"; prompt = ""; -font = "FuraCodeNerdFont-14"; +font = "FuraCodeNerdFont-13"; bottom = false; prompt_fg = "#FFFFFF"; diff --git a/.kshrc b/.kshrc index b1e70d6..f442f68 100644 --- a/.kshrc +++ b/.kshrc @@ -126,6 +126,7 @@ alias vimrc="vim ~/.vimrc" alias exrc="vim ~/.exrc" alias ebay="chrome https://www.ebay-kleinanzeigen.de/m-nachrichten.html &" +alias sbl="chrome https://scottsbasslessons.com &" alias remake="make clean=all; make" # remind @@ -193,7 +194,7 @@ pkg_reset() { pkg_delete -cIX $(cat > /tmp/muttpatch.diff~/.mutt/scripts/portpatch2.sh /tmp/muttpatch.diff" clear + printf '\n---------------------------------------------------------------------\n' grep -E 'Subject: |^Index|^RCS|^diff --git|^file +|^[-+]{3} ' "${1}" printf '---------------------------------------------------------------------\n\n' @@ -12,6 +13,8 @@ printf "Apply patch on path? " read -r _path _path=$(dev-dirs $_path) +print "Using: $_path" + printf "Fix quoted-printable mangeled patch? [y/N]: " read -r _qprint @@ -23,5 +26,11 @@ esac printf "Strip? [0]: " read -r _strip -${_catcmd} "${1}" | doas patch -Ep${_strip:=0} -d ${_path:=/usr/ports} +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 + +${_catcmd} "${1}" | doas -u sdk patch -E -p${_strip:=0} -d ${_path} cd ${_path} && doas su diff --git a/.ssh/config b/.ssh/config index dab1f2e..fa72d96 100644 --- a/.ssh/config +++ b/.ssh/config @@ -7,7 +7,7 @@ ServerAliveCountMax 240 AddKeysToAgent yes #IPQoS lowdelay throughput CanonicalizeHostname yes -CanonicalDomains home.codevoid.de codevoid.de uugrn.org openbsd.org +CanonicalDomains dhcp.codevoid.de codevoid.de uugrn.org openbsd.org ForwardX11 no ForwardX11Trusted no ForwardAgent no diff --git a/.vimrc b/.vimrc index b6c1acc..098d12e 100644 --- a/.vimrc +++ b/.vimrc @@ -49,11 +49,10 @@ nmap ga (EasyAlign) augroup code au! au BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$") | exe "normal! g'\"" | endif - au BufRead,BufNewFile Makefile,/usr/src/*.c,/usr/src/*.h,*.gmk setl sw=8 sts=8 noet + au BufRead,BufNewFile Makefile,/usr/src/*.c,/usr/src/*.h,*.gmk setl sw=8 ts=8 noet augroup end " visual sugar -set textwidth=72 set formatprg=par\ -w72q hi LineNr ctermfg=15 @@ -69,6 +68,8 @@ hi VertSplit ctermbg=NONE ctermfg=246 cterm=NONE hi FoldColumn ctermbg=NONE ctermfg=251 cterm=NONE hi Folded ctermbg=233 ctermfg=251 cterm=NONE +hi SpellBad ctermbg=NONE ctermfg=124 + match ErrorMsg '\(TODO\|FIXME\|XXX\|: error:.*\|\s\+$\| \+\ze\t\)' " vi compatible options (from .exrc)