X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=brc2;h=1be253a6151eab4f2b735a557c67d026c5fa5b73;hb=8d29de95be2b44cac6e2cc3d0643f542be05e4bd;hp=6497accdce4f78007036d34acf10c63dc29873de;hpb=ac3e00755e07d2e298769000f7ea50bc0854b510;p=distro-setup diff --git a/brc2 b/brc2 index 6497acc..1be253a 100644 --- a/brc2 +++ b/brc2 @@ -393,16 +393,15 @@ astudio() { # Convert brains file path to url and vice versa # usage: brains [URL_OR_PATH] brains() { - _iki-convert /f/brains brains.fsf.org "$@" + _iki-convert '(/a)?/f/brains' brains.fsf.org "$@" } glue() { - _iki-convert /f/gluestick gluestick.office.fsf.org "$@" + _iki-convert '(/a)?/f/gluestick' gluestick.office.fsf.org "$@" } # usage: $0 REPO_PATH [URL_OR_PATH] _iki-convert() { - local url path input err repo_dir domain filename dir path - local initial_oldpwd initial_pwd + local url domain path input err repo_dir dir url_dir url repo_dir="$1" domain="$2" shift 2 @@ -417,7 +416,7 @@ _iki-convert() { fi case $input in http*) - path="$repo_dir/${input##https://$domain/wiki/}" + path="$repo_dir/${input##http*://"$domain"/wiki/}" if [[ $path == */ ]]; then path=${path%/}.mdwn fi @@ -425,52 +424,14 @@ _iki-convert() { ;; *) path=$(fp "$input") - url="https://$domain/wiki/${path#$repo_dir/}" + url_dir=$(echo "$path" | sed -r "s,^$repo_dir/,,") + url="https://$domain/wiki/$url_dir" url="${url%.mdwn}/" j echo "$url" ;; esac } -# Convert brains file path to url and vice versa. It copies the result to clipboard -# usage: brains [URL_OR_PATH] -brains() { - local url path input repo_dir err path - repo_dir=/a/f/brains - err=false - if ! type -p xclip &>/dev/null; then - echo "missing dependency for brains, please do: sudo apt install xclip" >&2 - err=true - fi - if ! type -p pee &>/dev/null; then - echo "missing dependency for brains, please do: sudo apt install moreutils" >&2 - err=true - fi - if $err; then - return 1 - fi - if [[ $1 ]]; then - input="$*" - else - read -r -p "enter path or url"$'\n' input - fi - case $input in - http*) - path="$repo_dir/${input##https://brains.fsf.org/wiki/}" - if [[ $path == */ ]]; then - path=${path%/}.mdwn - fi - printf "%s\n" "$path" |& pee "xclip -r -selection clipboard" cat - ;; - *) - path=$(realpath -s "$input") - url="https://brains.fsf.org/wiki/${path#$repo_dir/}" - url="${url%.mdwn}/" - echo "$url" |& pee "xclip -r -selection clipboard" cat - ;; - esac -} - # Generate beet smartplaylists for navidrome. # for going in the reverse direction, run @@ -593,6 +554,15 @@ EOF # beet playlist. use beetag with a playlist name bpl() { local playlist playlist_regex + case $1 in + -h|--help) + for playlist in "${!bpla[@]}"; do + printf "%s\n" "$playlist" + done + return 0 + ;; + esac + playlist="${*: -1}" playlist_regex='[a-z0-9_]' if [[ ! $playlist =~ $playlist_regex ]]; then @@ -662,7 +632,7 @@ beetag-help() { cat <<'EOF' -y other genres z fg player ' = toggle play 1-5 rate +y other genres z fg player ' = toggle play 1-5 rate ] repeat1 ; previous _ = delete up/down skip mpv vol,pause,seek EOF hr @@ -726,12 +696,13 @@ mpvrpc-percent-pos() { # 1-5 rate # q quit # ret next +# beetag() { local last_genre_i fstring tag id char new_item char_i genre tag remove doplay i j random path local do_rare_genres read_wait help line lsout tmp ls_line skip_lookback local escape_char escaped_input expected_input skip_input_regex right_pad erasable_line seek_sec local pl_state_path pl_state_dir pl_state_file tmpstr - local new_random pl_seed_path seed_num seed_file fmt first_play + local new_random pl_seed_path seed_num seed_file fmt first_play repeat1 local -a buttons button_map ids tags tmp_tags initial_ls ls_lines paths local -A button_i local -i i j volume scrolled id_count line_int skip_start pre_j_count head_count skip_lookback @@ -743,6 +714,7 @@ beetag() { scrolled=999 # more than any $LINES ### begin arg processing ### random=false + repeat1=false new_random=false case $1 in -r) @@ -807,10 +779,15 @@ beetag() { fi # PijokVipiotOzeph is just a random string for a delimiter + # shellcheck disable=SC2016 # false positive fmt='%ifdef{rating,$rating }'"$fstring"'$genre | $title - $artist - $album $length $id PijokVipiotOzeph $path' # shellcheck disable=SC2016 # obvious reason tmpstr=$(beet ls -f "$fmt" "$@" | { if $random; then sort -R --random-source=$pl_seed_path; else cat; fi; } ) mapfile -t initial_ls <<<"$tmpstr" + if [[ ! ${initial_ls[0]} ]]; then + echo "beetag: error: no result from beet ls $*" + return 1 + fi id_count=${#initial_ls[@]} for line in "${initial_ls[@]}"; do path="${line#*PijokVipiotOzeph }" @@ -965,6 +942,15 @@ beetag() { echo volume=$volume continue ;; + ']') + if $repeat1; then + repeat1=false + else + repeat1=true + fi + echo repeat1=$repeat1 + continue + ;; q) kill-bg-quiet return @@ -1131,10 +1117,12 @@ beetag() { fi fi done - if (( j < id_count - 1 )); then - j+=1 - else - j=0 + if ! $repeat1; then + if (( j < id_count - 1 )); then + j+=1 + else + j=0 + fi fi if [[ $playlist ]]; then echo $j >$pl_state_path @@ -1333,13 +1321,15 @@ btrbk-host-debug() { mkdir -p /tmp/b/s for host in $remote $alt; do - # this takes a while, we only want to do it on 1st run - if [[ -s /tmp/b/$host.log ]]; then continue; fi - ssh $host journalctl -u btrbk-run -u btrbk -u switch-mail-host -u btrbk-spread >/tmp/b/$host.log + h=$(ssh $host hostname) + rsync -a /var/log/btrbk $host:/var/log/btrbk /var/log/btrbk/$h + grr '\bsnapshot success' /var/log/btrbk/$h >/tmp/b/$h.log + + ## this takes a while, we only want to do it on 1st run + # if [[ -s /tmp/b/$host.log ]]; then continue; fi + # ssh $host journalctl -u btrbk-run -u btrbk -u switch-mail-host -u btrbk-spread >/tmp/b/$host.log done - if [[ ! -s /tmp/b/local.log ]]; then - jrbtrbk >/tmp/b/local.log - fi + gr '\bsnapshot success' /var/log/btrbk/*.log >/tmp/b/local.log cd /tmp/b for f in *.log; do gr '\bsnapshot success' $f >s/$f @@ -2104,7 +2094,7 @@ rename-test() { feh() { # F = fullscren, z = random, Z = auto zoom - command feh -FzZ "$@" + command feh --auto-rotate -FzZ "$@" } @@ -2217,7 +2207,7 @@ arb5() { arbtt-dump -l 30 -t json | jq -r '.[] | [ ( .inactive / 1000 | floor ) , ( .windows[] | select (.active == true) |.title) ] | @tsv' \ | tac | while read -r sec l; do if (( i % 6 == 0 && i >= 2 )); then - echo == $(( i / 6 + 1 )) == + echo "## $(( i / 6 + 1 )) ##" fi if (( sec > 10 )); then printf "%3d %s\n" $sec "$l" @@ -2238,19 +2228,22 @@ idea() { } ilogs-local() { - cd /var/lib/znc/moddata/log/iank/freenode/ - hr - for x in "#$1/"*; do - base=${x##*/} - files=() - for f in $@; do - tmp=\#$f/$base - if [[ -e $tmp ]]; then - files+=(\#$f/$base) - fi - done - sed \"s/^./${base%log}/\" ${files[@]}|sort -n + d=/var/lib/znc/moddata/log/iank/ + for n in freenode libera; do + cd $d/$n hr + for x in "#$1/"*; do + base=${x##*/} + files=() + for f in $@; do + tmp=\#$f/$base + if [[ -e $tmp ]]; then + files+=(\#$f/$base) + fi + done + sed \"s/^./${base%log}/\" ${files[@]}|sort -n + hr + done done } ilogs() { @@ -2263,7 +2256,11 @@ ilog-local() { chan="$1" d=/var/lib/znc/moddata/log/iank/ for n in freenode libera; do - cd $d$n/"$chan" && hr + if [[ ! -d $d$n/"$chan" ]]; then + continue + fi + cd $d$n/"$chan" + hr for x in *; do echo $x; sed "s/^./${x%log}/" $x; hr; done @@ -2333,9 +2330,119 @@ wgkey() { umask $umask_orig } +declare -A vpn_ips +vpn_ips[kd]=2 +# note: 1, 4, 5 are occupied by mail wireguard +vpn_ips[x3]=8 +vpn_ips[sy]=12 +vpn_ips[x2]=13 +vpn_ips[kw]=27 +vpn_ips[bo]=28 +vpn_ips[frodo]=34 + +vpn-ips-update() { + local host ipsuf f files + for host in ${!vpn_ips[@]}; do + ipsuf=${vpn_ips[$host]} + wghole $host $ipsuf + u /a/bin/ds/machine_specific/$host/filesystem/etc/systemd/system/openvpn-client-tr@.service < 3 )); then e expected 2-3 arg of hostname, ip suffix, and extrahost >&2 @@ -2347,12 +2454,20 @@ wghole() { if [[ $3 ]]; then extrahost=,$3 fi + for vpn_host in ${!vpn_ips[@]}; do + if [[ $vpn_host == "$host" ]]; then + continue + fi + vpn_allowed+=",10.174.${vpn_ips[$vpn_host]}.2/32" + done mkdir -p /p/c/machine_specific/$host/filesystem/etc/wireguard ( cd /p/c/machine_specific/$host/filesystem/etc/wireguard umask_orig=$(umask) umask 0077 - wg genkey | tee hole-priv.key | wg pubkey > hole-pub.key + if [[ ! -s hole-priv.key || ! -s hole-pub.key ]]; then + wg genkey | tee hole-priv.key | wg pubkey > hole-pub.key + fi cat >wghole.conf <>/tmp/calendar-bytes done done < <(grep -v '[#-]' /p/calendar-data) @@ -3509,7 +3625,61 @@ monero() { # rg my main files rgm() { - rg "$@" /p/pd.org /p/w.org /a/t.org /a/work.org /b + rg "$@" /p/w.org /a/t.org /a/work.org /b +} + +# re all my files more expansively +rem() { + local paths + paths="/p/c /b" + find $paths -not \( -name .svn -prune -o -name .git -prune \ + -o -name .hg -prune -o -name .editor-backups -prune \ + -o -name .undo-tree-history -prune \) 2>/dev/null | grep -iP --color=auto "$*" + rgv -m 5 "$*" $paths ||: +} + +# setup: +# pip3 install linode-cli +# linode-cli +livp9() { + local input ip id tmp + input=$1 + if [[ $2 ]]; then + id=$2 + ip=$3 + else + tmp=$(mktemp) + echo $tmp + linode-cli --json --pretty linodes create --root_pass loxHuceygomGisun | tee $tmp + read -r ip id <<<"$(tail -n+2 $tmp | jq -r '.[0].ipv4[0] , .[0].id')" + for string in $ip $id; do + case $string in + [0-9]*) : ;; + *) + echo "livp9: bad value ip=$ip id=$id input=$input" + return 1 + ;; + esac + done + rm $tmp + + while true; do + if timeout 4 ssh $ip :; then + break + fi + sleep 3 + done + fi + ssh $ip </dev/null; then # --no-messages because of annoying errors on broken symlinks # -z = search .gz etc files - # -. = search dotfilesq + # -. = search dotfiles rg() { command rg -. -z --no-messages -L -i -M 900 --no-ignore-parent --no-ignore-vcs -g '!.git' -g '!auto-save-list' -g '!.savehist' "$@" || return $?; } #fails if not exist. ignore complete -r rg 2>/dev/null ||: @@ -3628,6 +3798,12 @@ else alias rg=grr fi +# rg with respecting vcs ignore files +rgv() { + ret=0 + command rg -. -z --no-messages -L -i -M 900 -g '!auto-save-list' -g '!.savehist' "$@" || ret=$? + return $ret +} # taken from default changes to bashrc and bash_profile