diff --git a/.bin/dexec_browser b/.bin/dexec_browser index 5752262..b968726 100755 --- a/.bin/dexec_browser +++ b/.bin/dexec_browser @@ -21,7 +21,7 @@ touch "${HISTFILE}" read_input() { local S=$( { echo "paste_from_clipboard"; tail -r ${HISTFILE}; } \ | awk '!seen[$0]++' \ - | ${DMENU_CMD} -p "Bookmarks") + | ${DMENU_CMD} -p "Bookmarks" -l 20) case "${S}" in paste_from_clipboard) S=$(xclip -o | head -n 1); ;; @@ -85,7 +85,7 @@ Zalando" esac local S="$(printf "%s\n%s" "${DEFAULT}" "${SE}" \ - | ${DMENU_CMD} -p "Search Where?")" + | ${DMENU_CMD} -p "Search Where?" -l 20)" C=$(echo "$C" | sed 's/ /%20/g') case "${S}" in OPEN*) URI="${C}"; ;; @@ -161,6 +161,6 @@ save_history() { # main program starts here. read_input choose_wrapper -choose_browser +# choose_browser save_history exec $BROWSER "$(printf '%s' "${URI}" | sed 's/ /%20/g')" diff --git a/.bin/dexec_term b/.bin/dexec_term index 3c950dc..db45733 100755 --- a/.bin/dexec_term +++ b/.bin/dexec_term @@ -1,4 +1,4 @@ #!/bin/sh . $HOME/.bin/_config -S=$(dmenu_path | $DMENU_CMD -p Exec) -[ ! -z $S ] && sterm -e "$S" +S="$(dmenu_path | $DMENU_CMD -p "Terminal:")" +[ ! -z "$S" ] && sterm -e "ksh -ic \"$S\"" diff --git a/.bin/dexec_vpn b/.bin/dexec_vpn index ec548d6..8760985 100755 --- a/.bin/dexec_vpn +++ b/.bin/dexec_vpn @@ -16,6 +16,7 @@ then then doas wg-quick down $ACTIVE && NOTIFY_CMD "VPN: disconnected" sleep 1 + doas ifconfig trunk0 inet6 autoconf fi exit 0 fi @@ -32,6 +33,9 @@ if [ ! -z "$ACTIVE" ] then doas wg-quick down $ACTIVE && NOTIFY_CMD "VPN: disconnected" sleep 1 + doas ifconfig trunk0 inet6 autoconf fi +doas ifconfig trunk0 -inet6 +sleep 1 doas wg-quick up vpn && NOTIFY_CMD "VPN: $HOST" diff --git a/.bin/edit-dns b/.bin/edit-dns index d852c14..349166b 100755 --- a/.bin/edit-dns +++ b/.bin/edit-dns @@ -1,5 +1,14 @@ #!/bin/sh +ZONE=codevoid.de + +if [ ! -z $1 ] +then + ZONE=$1 +fi + ssh -t dns.codevoid.de \ - "doas vim /var/nsd/zones/master/codevoid.de \ + "doas vim /var/nsd/zones/master/$ZONE \ && doas nsd-control reload" + +sleep 2 diff --git a/.bin/hterm b/.bin/hterm index 7cbd312..5584ca3 100755 --- a/.bin/hterm +++ b/.bin/hterm @@ -1,3 +1,3 @@ #!/bin/sh +x . $HOME/.bin/_config -$HTERM -T "term" $@ +$HTERM $@ diff --git a/.bin/ksh-update-completions b/.bin/ksh-update-completions index 779f777..c236c45 100755 --- a/.bin/ksh-update-completions +++ b/.bin/ksh-update-completions @@ -25,6 +25,9 @@ ARGS="reload restart stop start disable enable ls" add "set -A complete_rcctl_1 -- " "$ARGS" add "set -A complete_rcctl_2 -- " "$(rcctl ls all)" add "set -A complete_got_1 -- " "$(got -h 2>&1 | sed -n s/commands://p)" +add "set -A complete_xdl_1 -- " "$(cd ~/x && ls -d *)" +add "set -A complete_ydl_1 -- " "$(cd ~/Videos/YouTube && ls -d *)" + add "set -A complete_cg -- " "bitreich cufflink efnet hackint ircnet liberachat oftc robustirc uugrn" diff --git a/.bin/obsdmake b/.bin/obsdmake index ec7c341..7f8a568 100755 --- a/.bin/obsdmake +++ b/.bin/obsdmake @@ -10,7 +10,7 @@ JOBS="${JOBS:=$(sysctl -n hw.ncpuonline)}" export CCACHE_DIR="/var/ccache" export CCACHE_SLOPPINESS="locale,time_macros,random_seed,file_stat_matches,pch_defines" -export CCACHE_MAXSIZE=60G +export CCACHE_MAXSIZE=20G export CCACHE_NOHASHDIR= export CMAKE_CXX_COMPILER_LAUNCHER=ccache diff --git a/.bin/sshot b/.bin/sshot index 98e7709..f8d1376 100755 --- a/.bin/sshot +++ b/.bin/sshot @@ -1,9 +1,11 @@ -#!/bin/sh -e +#!/bin/sh + . ${HOME}/.bin/_config trap cleanup 1 2 3 6 cleanup() { rm -f "$file"; } + # FILENAME file="${HOME}/Downloads/Screenshots/$(date "+%Y-%m-%d_%H-%M-%S")-sshot.png" mkdir -p "$(dirname "$file")" diff --git a/.config/luakit/theme.lua b/.config/luakit/theme.lua index cbe5eb5..a7a885b 100644 --- a/.config/luakit/theme.lua +++ b/.config/luakit/theme.lua @@ -5,7 +5,7 @@ local theme = {} -- Default settings -theme.font = "16px Terminus" +theme.font = "16px Terminess" theme.fg = "#D8D8D8" theme.bg = "#181818" diff --git a/.config/spectrwm/spectrwm.conf b/.config/spectrwm/spectrwm.conf index 7b47768..95d2929 100644 --- a/.config/spectrwm/spectrwm.conf +++ b/.config/spectrwm/spectrwm.conf @@ -20,7 +20,7 @@ color_unfocus_free = rgb:55/35/00 tile_gap = 16 region_padding = 16 disable_border = 0 -maximize_hide_bar = 1 +maximize_hide_bar = 0 # +-------------------------------------------------- # | BAR SETTINGS @@ -125,6 +125,7 @@ quirk[hl] = FLOAT + ANYWHERE + FOCUSPREV quirk[hashlink] = FLOAT + ANYWHERE + FOCUSPREV quirk[scratchpad] = FLOAT + ANYWHERE + FOCUSPREV quirk[XConsole:xconsole] = FLOAT + ANYWHERE + NOFOCUSCYCLE + NOFOCUSONMAP +quirk[Xmessage:xmessage] = FLOAT + ANYWHERE + FOCUSONMAP_SINGLE # +-------------------------------------------------- # | RESET ALL KEYBOARD MAPPINGS @@ -157,9 +158,21 @@ bind[vpn] = MOD+V program[exec] = dexec bind[exec] = MOD+D +program[cexec] = dexec_command +bind[cexec] = MOD+C + +program[texec] = dexec_term +bind[texec] = MOD+Shift+D + program[ssh] = dexec_ssh bind[ssh] = MOD+S +program[ssh] = dexec_ssh +bind[ssh] = MOD+S + +program[edit] = dexec_edit +bind[edit] = MOD+numbersign + program[scratchpad] = sp bind[scratchpad] = MOD+minus @@ -220,13 +233,13 @@ bind[iconify] = MOD+i # MASTER bind[master_add] = MOD+comma bind[master_del] = MOD+period -bind[master_grow] = MOD+Right + bind[master_shrink] = MOD+Left bind[stack_dec] = MOD+Shift+comma bind[stack_inc] = MOD+Shift+period #bind[stack_reset] = MOD+Shift+space -bind[maximize_toggle] = MOD+f -#bind[fullscreen_toggle] = MOD+f +bind[maximize_toggle] = MOD+F +bind[fullscreen_toggle] = MOD+Control+F # WS NAVIGATION bind[ws_1] = MOD+1 diff --git a/.ksh/ytdl.ksh b/.ksh/ytdl.ksh index b24246d..c9cd2d8 100644 --- a/.ksh/ytdl.ksh +++ b/.ksh/ytdl.ksh @@ -2,10 +2,6 @@ # YOUTUBE-DL ######################################################################## -ytdl() { - yt-dlp "$@"; -} - ytdl_playlist() { yt-dlp \ -o '%(playlist_title)s/%(title)s.%(ext)s' \ @@ -37,7 +33,23 @@ ytdl_audio() { "$@"; } xdl() { - mkdir -p "$HOME/x/$1/" - cd "$HOME/x/$1/" && ytdl "$2" + if [ ! -z $2 ] + then + mkdir -p "$HOME/x/$1/" + cd "$HOME/x/$1/" && yt-dlp "$2" + ksh-update-completions + else + echo "First argument should be a category." + fi } +ytdl() { + if [ ! -z $2 ] + then + mkdir -p "$HOME/Videos/YouTube/$1/" + cd "$HOME/Videos/YouTube/$1/" && yt-dlp "$2" + ksh-update-completions + else + echo "First argument should be a category." + fi +} diff --git a/.kshrc b/.kshrc index 2a6ef12..2e88d96 100644 --- a/.kshrc +++ b/.kshrc @@ -47,6 +47,12 @@ export PRINTER # MANDATORY ENVIRONMENT ######################################################################## +# hack for more colors in cool-retro-term +if [ ! -z $COLORFGBG ] +then + TERM=xterm-256color +fi + ### HISTORY HISTCONTROL=ignoredups:ignorespace:erasedups HISTFILE=$HOME/.ksh-history diff --git a/.mutt/scripts/portpatch2.sh b/.mutt/scripts/portpatch2.sh index 98dfe41..917a0bf 100755 --- a/.mutt/scripts/portpatch2.sh +++ b/.mutt/scripts/portpatch2.sh @@ -1,17 +1,19 @@ -#!/bin/sh -e +#!/bin/ksh -e # needs converters/qprint # mutt: macro pager,attach \cs "cat > /tmp/muttpatch.diff~/.mutt/scripts/portpatch2.sh /tmp/muttpatch.diff" clear +. ~/.ksh/porttools.ksh + printf '\n---------------------------------------------------------------------\n' grep -E 'Subject: |^Index|^RCS|^diff --git|^file +|^[-+]{3} ' "${1}" printf '---------------------------------------------------------------------\n\n' printf "Apply patch on path? " read -r _path -_path=$(dev-dirs $_path) +_path=$(port-jump $_path; pwd) print "Using: $_path" diff --git a/.ssh/config b/.ssh/config index 44aa300..bdd9129 100644 --- a/.ssh/config +++ b/.ssh/config @@ -46,8 +46,25 @@ Host sdf User sdk Host home + Hostname home.codevoid.de User sdk +Host dalek + Hostname dalek.home.codevoid.de + User sdk + +Host tweety + Hostname tweety.home.codevoid.de + User sdk + +Host cvs + Hostname cvs.openbsd.org + User sdk + +Host osmc + Hostname osmc.home.codevoid.de + User osmc + # --- NOTES --- # ProxyCommand /bin/nc -X connect -x socks.proxy.lan:3128 %h %p