From 5884be7d10bbeb1399e035c690a5e49a87070b0f Mon Sep 17 00:00:00 2001 From: c0dev0id Date: Mon, 6 Mar 2023 08:14:38 +0100 Subject: [PATCH] Update 2023-03-06 08:14 OpenBSD/amd64 --- .bin/_config | 15 ++++++---- .bin/dev-dirs | 2 +- .bin/dexec_browser | 3 ++ .bin/dexec_mail | 21 +++++++++++--- .bin/dexec_man | 4 +-- .kshrc | 2 ++ .mutt/rc-common | 10 +++---- .vim/vimrc | 72 ++++++++++++++++++++++++---------------------- 8 files changed, 76 insertions(+), 53 deletions(-) diff --git a/.bin/_config b/.bin/_config index 75800a4..ee4ce07 100644 --- a/.bin/_config +++ b/.bin/_config @@ -4,11 +4,16 @@ # # FONTS # -DFONT="FuraCodeNerdFont-13" # Font for dmenu -#SFONT="FuraCodeNerdFont-11" # productive -SFONT="-uw-ttyp0-medium-r-normal--18-170-75-75-c-90-iso8859-1" -BFONT="FuraCodeNerdFont-15" # couch distance -HFONT="FuraCodeNerdFont-19" # presentation +#DFONT="FuraCodeNerdFont-13" # Font for dmenu +##SFONT="FuraCodeNerdFont-11" # productive +#SFONT="-uw-ttyp0-medium-r-normal--18-170-75-75-c-90-iso8859-1" +#BFONT="InputMono-15" # couch distance +#HFONT="FuraCodeNerdFont-19" # presentation + +DFONT="InputMono-13" # Font for dmenu +SFONT="InputMono-12" # couch distance +BFONT="InputMono-15" # couch distance +HFONT="InputMono-19" # couch distance # # TERMINALS diff --git a/.bin/dev-dirs b/.bin/dev-dirs index 98c56b1..a01760d 100755 --- a/.bin/dev-dirs +++ b/.bin/dev-dirs @@ -8,7 +8,7 @@ _ports=$(echo "SELECT PkgPath from Paths;" \ | sqlite3 /usr/local/share/sqlports \ | sort -u) -_list=$(find /usr/ports/mystuff/*/* /usr/src/*/* /usr/xenocara/*/* -type d -maxdepth 0) +_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" \ | grep -v "/CVS" \ diff --git a/.bin/dexec_browser b/.bin/dexec_browser index cd08ef5..c7da83f 100755 --- a/.bin/dexec_browser +++ b/.bin/dexec_browser @@ -84,6 +84,7 @@ Marc Info OpenBSD Tech List PDF Viewer SearX Web Search SearX Image Search +Torrent Leech Wikipedia DE Wikipedia EN InternetMovieDataBase (IMDB) @@ -114,6 +115,7 @@ Zalando" local S="$(printf "%s\n%s" "${DEFAULT}" "${SE}" \ | ${DMENU_CMD} -p "Search Where?")" + C=$(echo "$C" | sed 's/ /%20/g') case "${S}" in OPEN*) URI="${C}"; ;; Amazon*) URI="https://www.amazon.de/s?k=${C}"; ;; @@ -127,6 +129,7 @@ Zalando" D*Ima*) URI="https://duckduckgo.com/?q=${C}&iax=images&ia=images"; ;; S*Web*) URI="https://searx.bar/search?q=${C}&category_general=on"; ;; S*Ima*) URI="https://searx.bar/search?q=${C}&category_images=on"; ;; + Tor*Lee*) URI="https://www.torrentleech.org/torrents/browse/index/query/${C}"; ;; W*DE*) URI="https://de.m.wikipedia.org/wiki/Spezial:Suche/${C}"; ;; W*EN*) URI="https://en.m.wikipedia.org/wiki/Spezial:Search/${C}"; ;; *IMDB*) URI="https://www.imdb.com/find?q=${C}"; ;; diff --git a/.bin/dexec_mail b/.bin/dexec_mail index aba3581..6716c0a 100755 --- a/.bin/dexec_mail +++ b/.bin/dexec_mail @@ -1,10 +1,23 @@ #!/bin/sh -ALIASES=$(ksh -ic alias | grep ^mutt- | cut -d= -f1) +# ALIASES=$(ksh -ic alias | grep ^mutt- | cut -d= -f1) +# +# MAILBOX="imaps://mail.codevoid.de" +# +# SEL=$(printf "$ALIASES" | $DMENU_CMD -p Mutt) +# +# [ -z "$SEL" ] || texec $SEL . $HOME/.bin/_config -MAILBOX="imaps://mail.codevoid.de" +MAILBOXES=$(cd ~/.emails && find Mailboxes/*/ \ + -mindepth 1 -maxdepth 1 -type d \ + -not -path "*/tmp*" \ + -not -path "*/cur*" \ + -not -path "*/new*") -SEL=$(printf "$ALIASES" | $DMENU_CMD -p Mutt) +HOST="imaps://mail.codevoid.de" -[ -z "$SEL" ] || texec $SEL + +SEL=$(echo "$MAILBOXES" | $DMENU_CMD -p Mutt) + +[ -z "$SEL" ] || texec "mutt -F $HOME/.mutt/rc-account-private -f $HOST/$SEL" diff --git a/.bin/dexec_man b/.bin/dexec_man index ab87792..74ee04f 100755 --- a/.bin/dexec_man +++ b/.bin/dexec_man @@ -1,9 +1,7 @@ #!/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 | $DMENU_CMD -p "Manpage" )" +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")" if [ ! -z "$MAN" ]; then M="$(printf '%s' "$MAN" | cut -d"-" -f2)" diff --git a/.kshrc b/.kshrc index c7a23d3..7787343 100644 --- a/.kshrc +++ b/.kshrc @@ -245,6 +245,8 @@ alias tarsnap="doas \tarsnap" # archives alias innoextract="\innoextract -g --no-gog-galaxy" +alias wget-mirror="wget --mirror --page-requisites --html-extension --convert-links" + # games alias quake="\vkquake +game id1" alias quake-mp1-scourge_of_armagon="\vkquake +game hipnotic" diff --git a/.mutt/rc-common b/.mutt/rc-common index 482526a..1152b65 100644 --- a/.mutt/rc-common +++ b/.mutt/rc-common @@ -72,7 +72,7 @@ set attribution = "%n wrote (%D):" # TOFU filter # set my_tprot='t-prot -aelmtS -c --bigq -Mmutt --spass --pgp-move --pgp-short' # set display_filter=$my_tprot -set display_filter=~/.mutt/scripts/display-filter +# set display_filter=~/.mutt/scripts/display-filter subscribe ports@openbsd.org send-hook '~C ^ports@openbsd\.org$' 'my_hdr From: sh+openbsd-ports@codevoid.de' @@ -128,7 +128,7 @@ bind editor ^T complete # Format set pager_format = "From: %f %* %d %P" set date_format = "%Y-%m-%d %H:%M %Z" -set index_format = "%Z : %-18.18F : %s %* \ %?y?[%y] ?%[%H:%M %d.%m.%y]" +set index_format = "%Z : %-18.18F : %s %* \ %?y?[%y] ?%[%H:%M %d.%m.%y] %4c" set forward_format = "Fw: %s" set attach_format = "%u%D%I %t%4n %6T Size: %s, Type: %m/%M %d %F %> [ %C %e ] " set folder_format = "%t %2C %d %f %> %s Bytes " @@ -241,8 +241,8 @@ macro pager s "?" "move a message to a mailbox" bind index x sync-mailbox # POS1 and END navigation -bind index,browser home first-entry -bind index,browser end last-entry +bind index,browser ,g first-entry +bind index,browser ,G last-entry bind pager top bind pager bottom @@ -304,7 +304,7 @@ set ssl_verify_host = no set crypt_use_gpgme = yes # use the new gpgme method (disabling cumbersome gpg commands below) set crypt_replyencrypt = yes # encrypt, if original mail was encrypted set crypt_replysign = yes # sign, if original mail was signed -set crypt_verify_sig = no # verify sig, if sig is available +set crypt_verify_sig = yes # verify sig, if sig is available set crypt_autosign = no # sign mails per default set crypt_use_pka = yes # http://www.g10code.de/docs/pka-intro.de.pdf set crypt_autosmime = no diff --git a/.vim/vimrc b/.vim/vimrc index 64d6002..d93b66f 100644 --- a/.vim/vimrc +++ b/.vim/vimrc @@ -110,49 +110,51 @@ set t_ut= set background=dark let g:is_posix=1 +colorscheme goodwolf + " HIGHLIGHT SPECIAL WORDS match ErrorMsg '\(TODO:\|FIXME\|XXX\|workaround\|WTF\|: error:.*\|\s\+$\| \+\ze\t\)' -" MY THEME +" " MY THEME hi ColorColumn ctermbg=232 ctermfg=249 cterm=NONE -hi Comment ctermbg=NONE ctermfg=249 cterm=italic -hi Constant ctermbg=NONE ctermfg=251 cterm=italic hi CursorLine ctermbg=NONE ctermfg=NONE cterm=NONE hi CursorLineNr ctermbg=NONE ctermfg=NONE cterm=NONE -hi Directory ctermbg=NONE ctermfg=NONE cterm=NONE -hi Error ctermbg=NONE ctermfg=NONE cterm=NONE -hi ErrorMsg ctermbg=NONE ctermfg=196 cterm=NONE -hi Folded ctermbg=NONE ctermfg=246 cterm=inverse -hi Identifier ctermbg=NONE ctermfg=NONE cterm=NONE -hi Identifier ctermbg=NONE ctermfg=NONE cterm=NONE -hi Ignore ctermbg=NONE ctermfg=NONE cterm=NONE -hi IncSearch ctermbg=NONE ctermfg=251 cterm=inverse hi LineNr ctermbg=NONE ctermfg=240 cterm=NONE -hi MatchParen ctermbg=NONE ctermfg=202 cterm=bold -hi NonText ctermbg=NONE ctermfg=NONE cterm=NONE -hi Normal ctermbg=NONE ctermfg=NONE cterm=NONE -hi Pmenu ctermbg=NONE ctermfg=251 cterm=inverse -hi PmenuSel ctermbg=NONE ctermfg=251 cterm=bold -hi PreProc ctermbg=NONE ctermfg=251 cterm=NONE -hi Search ctermbg=NONE ctermfg=251 cterm=inverse -hi SignColumn ctermbg=NONE ctermfg=NONE cterm=NONE -hi Special ctermbg=NONE ctermfg=NONE cterm=NONE -hi SpecialComment ctermbg=NONE ctermfg=NONE cterm=NONE -hi SpecialKey ctermbg=NONE ctermfg=239 cterm=NONE -hi Statement ctermbg=NONE ctermfg=251 cterm=NONE -hi Statement ctermbg=NONE ctermfg=NONE cterm=NONE -hi String ctermbg=NONE ctermfg=251 cterm=NONE -hi TODO ctermbg=NONE ctermfg=246 cterm=italic -hi TabLine ctermbg=234 ctermfg=240 cterm=NONE -hi TabLineFill ctermbg=234 ctermfg=240 cterm=NONE -hi TabLineSel ctermbg=234 ctermfg=249 cterm=NONE -hi Title ctermbg=NONE ctermfg=246 cterm=bold -hi Type ctermbg=NONE ctermfg=NONE cterm=NONE -hi Underlined ctermbg=NONE ctermfg=251 cterm=underline -hi VisualNOS ctermbg=NONE ctermfg=246 cterm=NONE -hi WarningMsg ctermbg=NONE ctermfg=NONE cterm=NONE -hi Wildmenu ctermbg=NONE ctermfg=NONE cterm=NONE +" hi Comment ctermbg=NONE ctermfg=249 cterm=italic +" hi Constant ctermbg=NONE ctermfg=251 cterm=italic +" hi Directory ctermbg=NONE ctermfg=NONE cterm=NONE +" hi Error ctermbg=NONE ctermfg=NONE cterm=NONE +hi ErrorMsg ctermbg=NONE ctermfg=196 cterm=NONE +" hi Folded ctermbg=NONE ctermfg=246 cterm=inverse +" hi Identifier ctermbg=NONE ctermfg=NONE cterm=NONE +" hi Identifier ctermbg=NONE ctermfg=NONE cterm=NONE +" hi Ignore ctermbg=NONE ctermfg=NONE cterm=NONE +" hi IncSearch ctermbg=NONE ctermfg=251 cterm=inverse +" hi MatchParen ctermbg=NONE ctermfg=202 cterm=bold +" hi NonText ctermbg=NONE ctermfg=NONE cterm=NONE +" hi Normal ctermbg=NONE ctermfg=NONE cterm=NONE +" hi Pmenu ctermbg=NONE ctermfg=251 cterm=inverse +" hi PmenuSel ctermbg=NONE ctermfg=251 cterm=bold +" hi PreProc ctermbg=NONE ctermfg=251 cterm=NONE +" hi Search ctermbg=NONE ctermfg=251 cterm=inverse +" hi SignColumn ctermbg=NONE ctermfg=NONE cterm=NONE +" hi Special ctermbg=NONE ctermfg=NONE cterm=NONE +" hi SpecialComment ctermbg=NONE ctermfg=NONE cterm=NONE +" hi SpecialKey ctermbg=NONE ctermfg=239 cterm=NONE +" hi Statement ctermbg=NONE ctermfg=251 cterm=NONE +" hi Statement ctermbg=NONE ctermfg=NONE cterm=NONE +" hi String ctermbg=NONE ctermfg=251 cterm=NONE +" hi TODO ctermbg=NONE ctermfg=246 cterm=italic +" hi TabLine ctermbg=234 ctermfg=240 cterm=NONE +" hi TabLineFill ctermbg=234 ctermfg=240 cterm=NONE +" hi TabLineSel ctermbg=234 ctermfg=249 cterm=NONE +" hi Title ctermbg=NONE ctermfg=246 cterm=bold +" hi Type ctermbg=NONE ctermfg=NONE cterm=NONE +" hi Underlined ctermbg=NONE ctermfg=251 cterm=underline +" hi VisualNOS ctermbg=NONE ctermfg=246 cterm=NONE +" hi WarningMsg ctermbg=NONE ctermfg=NONE cterm=NONE +" hi Wildmenu ctermbg=NONE ctermfg=NONE cterm=NONE " VIMDIFF COLORS hi DiffAdd ctermbg=22 ctermfg=NONE cterm=NONE