X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=brc2;h=af4d8082aaa92268c4f0f9daa5e10e6501be15c5;hb=51c8b40fd2aac71d29dc9298ca65425725ad1edd;hp=12586845d49bad0468673dd5d041ae5463830367;hpb=090c49e2a17530c560488270e681d3e23046afc5;p=distro-setup diff --git a/brc2 b/brc2 index 1258684..af4d808 100644 --- a/brc2 +++ b/brc2 @@ -71,6 +71,8 @@ source /a/bin/ds/beet-data # * functions + + multimic() { local i local -a sources @@ -126,6 +128,12 @@ zcheck() { ssh bow rm /tmp/oegu.jpg feh /t/oegu.jpg } +zmon() { + while true; do + ziva-screen + sleep 15 + done +} slemacs() { local arg rtime v @@ -289,11 +297,41 @@ tback() { # sshfs example: # s sshfs bu@$host:/bu/home/md /bu/mnt -o reconnect,ServerAliveInterval=20,ServerAliveCountMax=30 -o allow_other +edelayoff() { + echo all >/etc/exim4/no-delay-eximids +} +edelayon() { + echo >/etc/exim4/no-delay-eximids +} + eqgo() { - enn -M "$(exiqgrep -i -r.\*)" + local -a array tmpstr delayon + delayon=true + if grep -qFx all /etc/exim4/no-delay-eximids; then + delayon=false + fi + if $delayon; then + echo all >/etc/exim4/no-delay-eximids + fi + tmpstr=$(exiqgrep -i -r.\*) + mapfile -t array <<<"$tmpstr" + enn -M "${array[@]}" + if $delayon; then + echo >/etc/exim4/no-delay-eximids + fi } eqgo1() { - enn -M "$(exipick -i -r.\*|h1)" + local eid + eid="$(exipick -i -r.\*|h1)" + sed -n "/^all$/p;\$a $eid" /etc/exim4/no-delay-eximids + enn -M "$eid" +} +ennm() { + local eid + for eid; do + printf "%s\n" "$eid" >>/etc/exim4/no-delay-eximids + done + enn -M "$@" } @@ -328,6 +366,17 @@ anki() { schroot -c buster -- anki } +daycat() { + ngset + hrcat /m/md/daylert/{cur,new}/* + ngreset +} +dayclear() { + ngset + rm -f /m/md/daylert/{cur,new}/* +} + + acat() { ngset hrcat /m/md/alerts/{cur,new}/* @@ -349,7 +398,7 @@ alerts() { ralerts() { # remote alerts local ret shell # this list is duplicated in check-remote-mailqs - for h in bk je li frodo kwwg x3wg x2wg kdwg sywg; do + for h in bk je li frodo x3wg kdwg sywg; do echo $h: shell="ssh $h" if [[ $HOSTNAME == "${h%wg}" ]]; then @@ -387,24 +436,46 @@ astudio() { /a/opt/android-studio/bin/studio.sh "$@" & r } -# convert brains path to url -# /f/brains/sysadmin/interns/2022/nick_shrader/intro_blog_post.mdwn -# becomes -# https://brains.fsf.org/wiki/sysadmin/interns/2022/nick_shrader/intro_blog_post -iki() { - local url path +# Convert brains file path to url and vice versa +# usage: brains [URL_OR_PATH] +brains() { + _iki-convert brains.fsf.org/wiki "$@" +} +glue() { + _iki-convert gluestick.office.fsf.org "$@" +} + +# usage: see above +_iki-convert() { + local url url_prefix path input err repo_dir dir url_dir url name + url_prefix="$1" + name="${url_prefix%%.*}" + repo_dir="/f/$name" + shift if [[ $1 ]]; then - path="$*" + input="$*" else - read -r -p "enter path" path + read -r -p "enter path or url"$'\n' input fi - url=$(readlink -f "$path") - url="https://brains.fsf.org/wiki/${url#*brains/}" - url="${url%.mdwn}" - echo "$url" - + case $input in + http*) + path="$repo_dir/${input##http*://"$url_prefix"/}" + if [[ $path == */ ]]; then + path=${path%/}.mdwn + fi + j printf "%s\n" "$path" + ;; + *) + path=$(fp "$input") + url_dir=$(echo "$path" | sed -r "s,^(/a)?$repo_dir/,,") + url="https://$url_prefix/$url_dir" + url="${url%.mdwn}/" + j echo "$url" + ;; + esac } + # Generate beet smartplaylists for navidrome. # for going in the reverse direction, run # /b/ds/navidrome-playlist-export @@ -525,7 +596,24 @@ EOF # beet playlist. use beetag with a playlist name bpl() { - eval beetag -r "$@" "${bpla[${@: -1}]}" + 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 + echo "bpl: error unexpected chars in playlist: $playlist" + return 1 + fi + # all but last arg as options + eval beetag -r "${*:1:$# - 1}" "${bpla[$playlist]}" } complete -W "${!bpla[*]}" bpl @@ -538,31 +626,102 @@ beetmq() { sed 's/^format_item:.*/format_item: ignore_this/' ~/.config/beets/config.yaml >$tmpf beet -c $tmpf modify -y "$@" > >(grep -vFx -e 'ignore_this' -e 'Modifying 1 items.' ||:) rm "$tmpf" - scrolled+=1 + beetag-nostatus 1 +} + +kill-bg-quiet() { + # https://stackoverflow.com/a/5722874 + kill %% 2>/dev/null ||:; wait %% 2>/dev/null ||: +} + +# debug variables +dv() { + for arg; do + printf "%s=%s " "$arg" "${!arg}" + done + echo } # Must be called from beetag for variables to be setup beetag-help() { + local -i i j col_total row col button_total row_total remainder_cols remainder_term + col_total=4 + button_total=${#button_map[@]} + row_total=$(( button_total / col_total )) + remainder_cols=$(( button_total % col_total )) + # for debugging + #dv button_total row_total remainder_cols + beetag-nostatus # - 3 is just a constant that helps things work in practice. if [[ $LINES ]] && (( LINES - 3 < scrolled )); then hr - for (( i=0; i<${#button_map[@]}; i++)); do - if (( i % 3 == 2 )); then - printf "%s %s\n" ${buttons[i]} ${button_map[i]} + for (( i=0; i/<- skip + + +y other genres z fg player ' = toggle play 1-5 rate ] repeat1 +; previous _ = delete up/down skip mpv vol,pause,seek EOF hr scrolled=10 fi } +# Must be called from beetag for variables to be setup +beetag-nostatus() { + if (( $# )); then + scrolled=$(( scrolled + $1 )) + fi + if $erasable_line; then + # https://stackoverflow.com/a/71286261 + # erase line / delete line in terminal + printf '\033[1A\033[K' + fi + erasable_line=false +} +# meant to be called from beetag +beetag-status() { + if $erasable_line; then + # https://stackoverflow.com/a/71286261 + printf '\033[1A\033[K' + fi + erasable_line=true +} + +# meant to be called from beetag +mpvrpc() { + if jobs -p | grep -q . &>/dev/null; then + printf "%s\n" "$*" | socat - /tmp/mpvsock >/dev/null ||: + fi +} +# meant to be called from beetag +# o for get output +mpvrpco() { + # note: testing for background jobs will output nothing if we are in a pipeline + printf "%s\n" "$*" | socat - /tmp/mpvsock ||: +} + +# meant to be called from beetag +mpvrpc-percent-pos() { + mpvrpco '{ "command": ["get_property", "percent-pos"] }' | jq .data | sed 's/\..*/%/' 2>/dev/null ||: +} + # tag with beets. # usage: beetag [-r] [-s] QUERY # it lists the query, reads an input char for tagging one by one. @@ -581,20 +740,26 @@ EOF # 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 +# +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 - local -a pl_tags buttons button_map ids tags rare_genres tmp_tags initial_ls ls_lines + 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 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 local -i overflow_lines overflow - + first_play=true + erasable_line=false escape_char=$(printf "\u1b") scrolled=999 # more than any $LINES ### begin arg processing ### random=false + repeat1=false + new_random=false case $1 in -r) random=true @@ -604,6 +769,10 @@ beetag() { random=false shift ;; + -x) + new_random=true + shift + ;; esac if (( ! $# )); then echo beetag: error expected a query arg >&2 @@ -617,17 +786,9 @@ beetag() { volume=70 read_wait=2 doplay=true - # because we were destined to run out of single key buttons. - rare_genres=( - jazz - musical - noise - skit - spoken-w - ) last_genre_i=$(( ${#common_genres[@]} - 1 )) - buttons=( {a..p} {r..w} 0 {6..9} , . / ) + buttons=( {a..p} {r..w} {6..8} , . / - "=") button_map=(${common_genres[@]} ${pl_tags[@]}) fstring= for tag in "${pl_tags[@]}"; do @@ -638,37 +799,125 @@ beetag() { button_i[${buttons[i]}]=$i done - # TODO: use shuf --random-source=FILE to save the random sort order - # for reusing later, so we can pickup where we left off in a playlist. + # note: this structure of files is rather haphazard. + seed_num=1 # later we might want a few + seed_file=seed$seed_num + if $random; then + pl_state_file=$seed_num + else + pl_state_file=sorted + fi + pl_state_dir=/i/info/pl-state + if [[ $playlist ]]; then + pl_state_dir=$pl_state_dir/$playlist + else + pl_state_dir=$pl_state_dir/nopl + fi + pl_state_path=$pl_state_dir/$pl_state_file + pl_seed_path=$pl_state_dir/$seed_file + + if $new_random || [[ ! -r $pl_seed_path ]]; then + mkdir -p $pl_state_dir + { base64 < /dev/urandom | head -c 200 ||:; echo; } > $pl_seed_path + 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 - mapfile -t initial_ls < <(beet ls -f '%ifdef{rating,$rating }'"$fstring"'$genre | $artist - $album - $title $length $id' "$@" | { if $random; then sort -R; else cat; fi; } ) - j=0 - # i only care to see the head of the list. - head_count=$(( LINES - 20 )) + 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 - id="${line##* }" + path="${line#*PijokVipiotOzeph }" + # https://github.com/koalaman/shellcheck/issues/2171 + # shellcheck disable=SC2190 # bug in shellcheck, looking at paths from an earlier function + paths+=("$path") + line_no_path="${line% PijokVipiotOzeph*}" + id="${line_no_path##* }" ids+=("$id") - right_pad="${line%% |*}" - ls_line="$(printf %-11s "$right_pad")${line#$right_pad}" + right_pad="${line_no_path%% |*}" + ls_line="$(printf %-11s "$right_pad")${line_no_path#"$right_pad"}" ls_lines+=("$ls_line") - if (( j < head_count )); then + i=$(( i+1 )) + done + + + + + j=0 + if [[ $playlist ]]; then + if [[ -r $pl_state_path ]]; then + j=$(cat $pl_state_path) + fi + fi + + # i only care to see a smallish portion of the list when starting. + head_count=$(( LINES - 20 )) + head_start=$(( j - head_count / 2 )) + if (( head_start < 0 )); then + head_start=0 + fi + for (( i=head_start; i < head_count && i < id_count; i++ )); do + ls_line="${ls_lines[$i]}" + if (( i == j )); then + echo "* $ls_line" + else echo "$ls_line" fi - j=$(( j+1 )) done - id_count=${#ids[@]} - for (( j=0; j < id_count; j++ )); do + if $doplay; then + #{ mpv --profile=a --volume=$volume --idle 2>&1 & } 2>/dev/null + mpv --profile=a --volume=$volume --idle & + # if we dont sleep, can expect an error like this: + # socat[1103381] E connect(5, AF=1 "/tmp/mpvsock", 14): Connection refused + sleep .1 + fi + + while true; do id=${ids[j]} + path="${paths[$j]}" lsout="${ls_lines[j]}" tags=( ${lsout%%,*} ) beetag-help printf "██ %s\n" "$lsout" - scrolled+=1 + beetag-nostatus 1 if $doplay; then # https://stackoverflow.com/a/7687716 # note: duplicated down below - { beet play "--args=--volume=$volume" "id:$id" 2>&1 & } 2>/dev/null + # + # notes on old method of invoking mpv each time: + # https://superuser.com/questions/305933/preventing-bash-from-displaying-done-when-a-background-command-finishes-execut + # we can't disown or run in a subshell or set +m because all that + # disabled job control from working properly in ways we want. + # todo: figure out some kind of answer to this. I think the solution + # is that we are waiting in 2 second intervals and checking if the + # background job exists. Instead, we should make mpv just idle + # when it is done with a song and then send it a command to play a new track. + #{ mpv --profile=a --volume=$volume "$path" 2>&1 & } 2>/dev/null + # old + #{ beet play "--args=--volume=$volume" "id:$id" 2>&1 & } 2>/dev/null + + # on slow systems, we may need to wait like .3 seconds before mpv + # is ready. so impatiently check until it is ready + if $first_play; then + first_play=false + for (( i=0; i<20; i++ )); do + if [[ $(mpvrpco '{ "command": ["get_property", "idle-active"] }' 2>/dev/null | jq .data) == true ]]; then + mpvrpc '{ "command": ["loadfile", "'"$path"'"] }' 2>/dev/null + break + fi + sleep .1 + done + else + mpvrpc '{ "command": ["loadfile", "'"$path"'"] }' + fi + erasable_line=false fi while true; do char= @@ -679,7 +928,8 @@ beetag() { # Automatically skip to the next song if this one ends, unless # we turn off the autoplay. if (( ret == 142 )) || [[ ! $char ]]; then - if bg %% &>/dev/null; then + if jobs -p | grep -q . &>/dev/null && \ + [[ $(mpvrpco '{ "command": ["get_property", "idle-active"] }' | jq .data) == false ]]; then continue else break @@ -690,13 +940,10 @@ beetag() { fi beetag-help if [[ $char == $'\n' ]]; then - # https://stackoverflow.com/a/5722874 - kill %%; wait %% 2>/dev/null ||: break fi case $char in ";") - kill %%; wait %% 2>/dev/null ||: j=$(( j - 2 )) break ;; @@ -706,44 +953,52 @@ beetag() { doplay=false else doplay=true - kill %%; wait %% 2>/dev/null ||: - { beet play "--args=--volume=$volume" "id:$id" 2>&1 & } 2>/dev/null + mpvrpc '{ "command": ["loadfile", "'"$path"'"] }' + erasable_line=false fi - scrolled+=1 + beetag-nostatus 1 continue ;; _) - kill %%; wait %% 2>/dev/null ||: m beet rm --delete --force "id:$id" - scrolled+=4 # guessing. dont want to test atm + beetag-nostatus 4 # guessing. dont want to test atm break ;; [1-5]) beetmq "id:$id" rating=$char continue ;; - -) + 9) volume=$(( volume - 5 )) if (( volume < 0 )); then volume=0 fi - echo volume=$volume - scrolled+=1 - continue - ;; - q) - kill %%; wait %% 2>/dev/null ||: - return - ;; - +) + ;;& + 0) volume+=5 if (( volume > 130 )); then volume=130 fi + ;;& + 0|9) + mpvrpc '{ "command": ["set_property", "volume", '$volume'] }' + beetag-status echo volume=$volume - scrolled+=1 continue ;; + ']') + if $repeat1; then + repeat1=false + else + repeat1=true + fi + echo repeat1=$repeat1 + continue + ;; + q) + kill-bg-quiet + return + ;; y) if $do_rare_genres; then do_rare_genres=false @@ -764,7 +1019,7 @@ beetag() { continue ;; z) - scrolled+=3 + beetag-nostatus 3 # if we ctrl-z, it will put the whole function into sleep. so # basically, we can't return from a foregrounded mpv like we # would like to without some strange mechanism I can't think @@ -776,17 +1031,35 @@ beetag() { fi continue ;; + + # + " ") + # output time if we aren't already paused + if [[ $(mpvrpco '{ "command": ["get_property", "pause"] }' | jq .data) == false ]]; then + # minutes/seconds + #date -d @"$(mpvrpco '{ "command": ["get_property", "playback-time"] }' | jq .data)" +%M:%S ||: + beetag-status + mpvrpc-percent-pos + fi + # originally found this solution, which worked fine. + #kill -STOP %% &>/dev/null + # + mpvrpc '{ "command": ["cycle", "pause"] }' + continue + ;; "$escape_char") expected_input=true read -rsn2 escaped_input skip_input_regex="^[0-9]+$" case $escaped_input in - '[D') - skip_lookback=5 + # up char: show all the songs, use less + '[A') skip_start=0 + skip_lookback=5 if (( j - skip_lookback > skip_start )); then skip_start=$(( j - skip_lookback )) fi + beetag-nostatus $(( id_count - skip_start - 1 )) { line_int=0 for (( i=skip_start; i < id_count; i++ )); do @@ -798,18 +1071,20 @@ beetag() { line_int+=1 done } | less -F - scrolled+=$(( id_count - skip_start - 1 )) ;; - '[C') + # down char + '[B') # skip forward, but show the last few songs anyways. skip_start=0 skip_lookback=3 if (( j - skip_lookback > skip_start )); then skip_start=$(( j - skip_lookback )) fi + beetag-nostatus $(( id_count - skip_start - 1 )) + line_int=0 overflow_lines=$LINES - for (( i=skip_start; i < overflow_lines - 1; i++ )); do + for (( i=skip_start; i < overflow_lines - 1 && i < id_count; i++ )); do ls_line="${ls_lines[i]}" overflow=$(( ${#ls_line} / ( COLUMNS - 1 ) )) overflow_lines=$(( overflow_lines - overflow )) @@ -820,7 +1095,21 @@ beetag() { echo "$line_int | $ls_line" line_int+=1 done - scrolled+=$(( id_count - skip_start - 1 )) + ;; + # left key + '[D') + seek_sec=-8 + ;;& + # right key + '[C') + seek_sec=8 + ;;& + '[C'|'[D') + beetag-status + mpvrpc-percent-pos + erasable_line=true + mpvrpc '{ "command": ["seek", "'$seek_sec'"] }' + continue ;; *) expected_input=false @@ -828,9 +1117,9 @@ beetag() { esac if $expected_input; then read -r skip_input - case skip_input in + case $skip_input in q) - kill %%; wait %% 2>/dev/null ||: + kill-bg-quiet return ;; esac @@ -841,7 +1130,6 @@ beetag() { j=$(( j - 1 )) fi fi - kill %%; wait %% 2>/dev/null ||: break fi ;; @@ -873,6 +1161,16 @@ beetag() { fi fi done + if ! $repeat1; then + if (( j < id_count - 1 )); then + j+=1 + else + j=0 + fi + fi + if [[ $playlist ]]; then + echo $j >$pl_state_path + fi done } @@ -908,6 +1206,8 @@ beet2nav() { # pull in beets library locally beetpull() { + local sshfs_host sshfs_cmd + sshfs_host=b8.nz if [[ $HOSTNAME == kd ]]; then return 0 fi @@ -915,8 +1215,9 @@ beetpull() { s mkdir /i s chown iank:iank /i fi - if ! mountpoint /i &>/dev/null; then - m sshfs b8.nz:/i /i + sshfs_cmd="sshfs -o ServerAliveInterval=15,reconnect $sshfs_host:/i /i" + if ! pgrep -f "^$sshfs_cmd$" >/dev/null; then + m $sshfs_cmd fi } @@ -996,6 +1297,109 @@ beegenre() { rm $tmpf } +# prettify the date +btrbk-date() { + local indate + indate="$1" + shift + date +%F_%T%:::z -d "$(sed -r 's/(.{4})(..)(.{5})(..)(.*)/\1-\2-\3:\4:\5/' <<<"$indate")" "$@" +} +btrbk-undate() { + # fudCaHougfirp is a random string + { if [[ $1 ]]; then + echo "$1" + else + cat + fi + } | sed -r 's/-0([45])( |$)/fudCaHougfirp0\100/;s/_/T/;s/[:-]//g;s/fudCaHougfirp/-/' + +} +btrbk-date-sed() { + local line + while read -r line; do + if [[ $line == *20[0-9][0-9][0-9][0-9][0-9][0-9]T[0-9][0-9][0-9][0-9][0-9][0-9]-0[45]00* ]]; then + pre="${line%%20[0-9][0-9][0-9][0-9][0-9][0-9]T[0-9][0-9][0-9][0-9][0-9][0-9]-0[45]00*}" + post="${line##*20[0-9][0-9][0-9][0-9][0-9][0-9]T[0-9][0-9][0-9][0-9][0-9][0-9]-0[45]00}" + mid="${line:${#pre}:22}" + echo "$pre$(btrbk-date "$mid")$post" + else + echo "$line" + fi + done +} +jrbtrbk() { + jr -u btrbk-run -u btrbk -u switch-mail-host "$@" +} + +# internal function +btrbk-host-debug-show-host() { + for f; do + snaphost= + for host in $remote $alt local; do + if line=$(grep -P "\S*$f" /tmp/b/s/$host.log); then + if [[ $snaphost ]]; then + e error: snaphost=$snaphost, host=$host line="$line" + fi + if [[ $line == ssh* ]]; then + tmp="${line#ssh://}" + snaphost="${tmp%%/*}" + else + snaphost=$host + fi + fi + done + echo $snaphost $f | btrbk-date-sed + done +} + +# If we get a btrfs receive error like this: +# ERROR: ... clone: did not find source subvol +# running this command will help track down the problem. +# Alter remote= and alt=. When I used it, remote is +# the host having the error when I push a snapshot. +# Alt is just the other host that takes snapshots +# besides the local host. +btrbk-host-debug() { + + remote=b8.nz + alt=sywg.b8.nz + + mkdir -p /tmp/b/s + for host in $remote $alt; do + 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 >/tmp/b/$host.log + done + 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 + done + cd /mnt/root/btrbk + localq=(q.*) + declare -A localq_a + for f in "${localq[@]}"; do + localq_a[$f]=t + done + + remoteq=() + for f in $(ssh $remote "cd /mnt/root/btrbk; echo q.*"); do + if [[ ! ${localq_a[$f]} ]]; then + remoteq+=($f) + fi + done + btrbk-host-debug-show-host "${localq[@]}" + if (( ${#remoteq[@]} >= 1 )); then + echo "=== $remote only ====" + btrbk-host-debug-show-host ${remoteq[@]} + fi + +} + # note, to check for glue records # First, find some the .org nameservers: # dig +trace iankelling.org @@ -1026,8 +1430,6 @@ bbk() { # btrbk wrapper return 1 ;; esac - # run latest - install-my-scripts # todo: consider changing this to srun and having the args come # from a file like /etc/default/btrbk, like is done in exim s jdo btrbk-run "$@" @@ -1081,14 +1483,16 @@ scr() { # tried to use ceb2txt but it failed because of schema # slightly different than what it expected. cheogram-get-logs() { - adb shell rm -r /storage/emulated/0/Download/Cheogram/Backup + #adb shell rm -r /storage/emulated/0/Download/Cheogram/Backup read -r -p "do cheogram backup on phone, do not enable extra cheogram data. press any key when done" cd /p/cheogram rm -rf Backup b adb pull /storage/emulated/0/Download/Cheogram/Backup sqlite3 b /b/data/daystart + else + cat /b/data/daystart + fi +} #### begin bitcoin related things btc() { @@ -1716,7 +2136,7 @@ rename-test() { feh() { # F = fullscren, z = random, Z = auto zoom - command feh -FzZ "$@" + command feh --auto-rotate -FzZ "$@" } @@ -1739,7 +2159,7 @@ gpg() { } gse() { - local email=ian@iankelling.org + local email=iank@fsf.org git send-email --notes "--envelope-sender=<$email>" \ --suppress-cc=self "$@" } @@ -1763,11 +2183,13 @@ hstatus() { done } -# work log +## work log +# +# note: database location is specified in ~/.timetrap.yml, currently /p/.timetrap.db wlog() { local day i days_back days_back=${1:-16} - for (( i=0; i=0; i-- )); do day=$( date +%F -d @$((EPOCHSECONDS - 86400*i )) ) date "+%a %b %d" -d @$((EPOCHSECONDS - 86400*i )) | tr '\n' ' ' /a/opt/timetrap/bin/t d -ftotal -s $day -e $day all -m '^w|lunch$' @@ -1785,26 +2207,113 @@ tl() { t s w } -arbttlog() { arbtt-dump "$@" | grep -v '( )\|Current Desktop' | sed -rn '/^[^ ]/{N;s/^(.{21})([0-9]*)[0-9]{3}m.*\(\*/\1\2/;s/^(.{21})[0-9]*.*\(\*/\1/;s/\n//;p}' ; } + +# help me focus. opens 2 windows. +focus() { + /p/c/proc/focus/linux-amd64/focus & + watcharb5 + kill %% +} + + +# Display a list of the active window title +# i've been on with 10 second samples going back +# 5 minutes. If I've been on one window for 10 seconds +# or longer, then display the second count. +# +# Press any key to exit. +watcharb5() { + local char ret + killall arbtt-capture &>/dev/null ||: + rm -f ~/.arbtt/capture.log + arbtt-capture --sample-rate=10 & + while true; do + arb5 + ret=0 + # i first thought to sleep and capture ctrl-c, but it seems we can't + # capture control-c, unless maybe we implement the commands in a + # separate script or maybe add err-cleanup to err. Anyways, this + # method is superior because any single char exits. + read -rsN1 -t 5 char || ret=$? + if (( ret == 142 )) || [[ ! $char ]]; then + # debug + #e ret=$ret char=$char + : + else + killall arbtt-capture ||: + return 0 + fi + done + +} + +arb5() { + local i j l sec blanks line + local -a arbtt_lines + if [[ ! -e ~/.arbtt/capture.log ]]; then + sleep 5 + fi + blanks=$(( LINES - 34 )) + for (( i=0; i < blanks; i++ )); do + echo + done + + { + i=0 + j=0 + # https://stackoverflow.com/questions/56486272/how-to-concat-multiple-fields-to-same-line-with-jq + arbtt_lines=$(arbtt-dump -l 30 -t json | \ + jq -r '.[] | [ ( .inactive / 1000 | floor ) , ( .windows[] | select (.active == true) |.title) ] | @tsv' | tac) + for line in "${arbtt_lines[@]}"; do + read -r sec l <<<"$line" + if (( j >= LINES )); then + break + fi + if (( i % 6 == 0 && i >= 2 )); then + j=$(( j + 1 )) + echo "## $(( i / 6 + 1 )) ##" + fi + if (( sec > 10 )); then + printf "%3d %s\n" $sec "$l" | sed -r "s/^(.{$COLUMNS}).*/\1/" + else + printf " %s\n" "$l" | sed -r "s/^(.{$COLUMNS}).*/\1/" + fi + i=$(( i + 1 )) + j=$(( j + 1 )) + done + while (( j < 34 && j < LINES )); do + echo + j=$(( j + 1 )) + done + } | tac +} + +arbttlog() { + # from the log, show only the currently active window, and the number of + # seconds of input inactivity. + arbtt-dump "$@" | grep -v '( )\|Current Desktop' | sed -rn '/^[^ ]/{N;s/^(.{21})([0-9]*)[0-9]{3}m.*\(\*/\1\2/;s/^(.{21})[0-9]*.*\(\*/\1/;s/\n//;p}' ; } idea() { /a/opt/idea-IC-163.7743.44/bin/idea.sh "$@" & r } 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() { @@ -1817,7 +2326,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 @@ -1852,11 +2365,6 @@ ccomp xdg-open o # jr() { journalctl "$@" | jfilter | less ; } # jrf() { journalctl -n 200 -f "$@" | jfilter; } -jr() { journalctl "$@" ; } -jrf() { journalctl -n 200 -f "$@" ; } - - -ccomp journalctl jtail jr jrf ## old version for model01. i need to get that firmware working again. # kff() { # keyboardio firmware flash. you must hold down the tilde key @@ -1886,20 +2394,145 @@ wgkey() { wg genkey | tee $name-priv.key | wg pubkey > $name-pub.key 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 <&2 + if (( $# < 2 || $# > 3 )); then + e expected 2-3 arg of hostname, ip suffix, and extrahost >&2 return 1 fi - local host ipsuf umask_orig + local host ipsuf umask_orig vpn_allowed host=$1 ipsuf=$2 + 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 </dev/null; then + m sudo mount --bind /root/mount_namespaces /root/mount_namespaces + fi + m sudo mount --make-private /root/mount_namespaces + if [[ ! -e /root/mount_namespaces/$ns ]]; then + m sudo touch /root/mount_namespaces/$ns + fi + if ! sudo mountpoint /root/mount_namespaces/$ns >/dev/null; then + m sudo unshare --propagation slave --mount=/root/mount_namespaces/$ns /bin/true + fi + + pid=$(servicepid $unit) + tmpf=$(mktemp --tmpdir $unit.XXXXXXXXXX) + export -p >$tmpf + printf "%s " "${@@Q}" >>$tmpf + echo >>$tmpf + + m sudo nsenter -t $pid -n --mount=/root/mount_namespaces/$ns sudo -u $USER -i bash -c ". $tmpf & sleep 1; rm $tmpf" +} + + mnsr() { # mns run local ns=$1 shift mns $ns sudo -u iank -E env "PATH=$PATH" "$@" } +mnsnonetr() { + ns=$1 + lomh + if ! s ip netns list | grep -Fx nonet &>/dev/null; then + s ip netns add nonet + fi + mns $ns --net=/var/run/netns/nonet /bin/bash + lomh +} + mnsnonet() { ns=$1 lomh @@ -1966,6 +2636,10 @@ mnsnonet() { lom() { # l = the loopback device local l base + # get sudo pass cached right away + if ! sudo -nv 2>/dev/null; then + sudo -v + fi if [[ $1 == /* ]]; then base=${1##*/} fs_file=$1 @@ -2180,13 +2854,29 @@ mpvs() { myirc() { if [[ ! $1 ]]; then - set -- fsf-office + set -- fsfsys fi local -a d d=( /var/lib/znc/moddata/log/iank/{freenode,libera} ) # use * instead of -r since that does sorted order ssh root@iankelling.org "for f in ${d[*]}; do cd \$f/#$1; grep '\ 15 )); then + i=$(( logcount - 15 )) + else + i=0 + fi + # usually do this on monday, sometimes later + if [[ $(date +%A) == Monday ]]; then + min_date=$(date -d 'monday 2 weeks ago' +%s) + else + min_date=$(date -d 'monday 3 weeks ago' +%s) + fi + for (( ; i < logcount; i++ )); do + log=${logs[$i]} + d=$(date -d "$(head -n1 $log|awk '{print $1}')" +%s) + if (( d < min_date )); then + continue + fi + if awk '$3 == "iank:"' $log | sed -r 's/^(.{10}).(.{8})[^ ]+(.*)/\1_\2\3/' | grep .; then + hr + fi + done + popd +} + + +# Tail all recent prof logs. Copying from profanity has unwanted line breaks +# especially for links. +profr() { + case $HOSTNAME in + kd) + profr-local + ;; + *) + ssh b8.nz profr-local + ;; + esac +} + +profr-local() { + local d0 d1 + local -a files + d0="$(date +%Y_%m_%d).log" + d1="$(date -d '1 day ago' +%Y_%m_%d).log" + ngset + files=(/d/p/profanity/chatlogs/iank_at_fsf.org/{*,rooms/*}/{$d0,$d1}) + ngreset + if (( ${#files[@]} > 0 )); then + cat "${files[@]}" | sort | tail -n 40 + fi +} + + +# Tail pms in the last day, for the case where we restart profanity and +# didn't check for pms beforehand. Assume the most recent logs are on kd. +# If that isn't the case, use prof-recent-local +prof-recent() { + case $HOSTNAME in + kd) + prof-recent-local + ;; + *) + ssh b8.nz prof-recent-local + ;; + esac +} +prof-recent-local() { + local d dates date files f + # consider making the day count passed by parameter. note: this works: $(date -d '2 day ago' +%Y_%m_%d) + dates=("$(date +%Y_%m_%d)" "$(date -d '1 day ago' +%Y_%m_%d)" ) + for d in /d/p/profanity/chatlogs/iank_at_fsf.org/!(rooms); do + files=() + for date in ${dates[@]}; do + f=$d/$date.log + if [[ -e $f ]]; then + files+=($f) + fi + done + if (( ${#files[@]} >= 1 )); then + cat ${files[@]} | tail + hr + fi + done } +prof-sort() { + case $HOSTNAME in + kd) + prof-recent-sort + ;; + *) + ssh b8.nz prof-recent-sort + ;; + esac +} + +prof-recent-sort() { + local d dates date files f + # consider making the day count passed by parameter. note: this works: $(date -d '2 day ago' +%Y_%m_%d) + dates=("$(date +%Y_%m_%d)" "$(date -d '1 day ago' +%Y_%m_%d)" ) + files=() + for d in /d/p/profanity/chatlogs/iank_at_fsf.org/!(rooms); do + for date in ${dates[@]}; do + f=$d/$date.log + if [[ -e $f ]]; then + files+=($f) + fi + done + done + for f in "${files[@]}"; do + sed "s/\$/ $f/" $f + done | sort +} + + # usage: debvm DEBIAN_VERSION RAM_MB debvm() { local ver ram fname src @@ -2296,9 +3101,17 @@ otp() { oathtool --totp -b "$*" | xclip -selection clipboard } j() { - "$@" |& pee "xclip -r -selection clipboard" + "$@" |& pee "xclip -r -selection clipboard" cat } +# x copy +xc() { + xclip -r -selection clipboard +} +# echo copy +ec() { + pee "xclip -r -selection clipboard" cat +} pakaraoke() { # from http://askubuntu.com/questions/456021/remove-vocals-from-mp3-and-get-only-instrumentals @@ -2632,9 +3445,12 @@ testexim() { # # -t = get recipient from header exim -d -t < /dev/null 2>&1 & } +## usage: to connect to my main transmission daemon from a different host, run this +trans-remote-route() { + : +} trg() { transmission-remote-gtk & r; } +# TODO: this wont work transmission.lan doesnt exist trc() { # example, set global upload limit to 100 kilobytes: # trc -u 100 @@ -2715,7 +3536,7 @@ enn() { s $ecmd "$@" return fi - pid=$(pgrep -f "/usr/sbin/exim4 -bd -q30m -C /etc/exim4/my.conf"|h1) + pid=$(pgrep -f "/usr/sbin/exim4 -bd -q10m -C /etc/exim4/my.conf"|h1) m s nsenter -t $pid -n -m $ecmd "$@" } @@ -2771,7 +3592,7 @@ sdnbashroot() { # systemd namespace bash sdncmd() { # systemd namespace cmd - local unit pid + local unit pid tmpf if (( $# <= 2 )); then echo $0: error wrong number of args >&2 return 1 @@ -2779,7 +3600,11 @@ sdncmd() { # systemd namespace cmd unit=$1 shift pid=$(servicepid $unit) - m sudo nsenter -t $pid -n -m sudo -u $USER -i "$@" + tmpf=$(mktemp --tmpdir $unit.XXXXXXXXXX) + export -p >$tmpf + printf "%s " "${@@Q}" >>$tmpf + echo >>$tmpf + m sudo nsenter -t $pid -n -m sudo -u $USER -i bash -c ". $tmpf & rm $tmpf" } @@ -2794,7 +3619,7 @@ mailnnbash() { eximbash() { local pid - pid=$(pgrep -f "/usr/sbin/exim4 -bd -q30m -C /etc/exim4/my.conf"|h1) + pid=$(pgrep -f "/usr/sbin/exim4 -bd -q10m -C /etc/exim4/my.conf"|h1) if [[ ! $pid ]]; then echo "eximbash: failed to find exim pid. systemctl -n 30 status exim4:" systemctl status exim4 @@ -2882,6 +3707,39 @@ fixu() { fi } +# unmute +um() { + local sink card + sink=$(pactl get-default-sink) + if [[ $sink != auto_null ]]; then + return + fi + + # guessing there is just one with an off profile. otherwise we will + # need some other solution, like storing the card identifier that we + # muted with nap. + card=$(pacmd list-cards | sed -n '/^[[:space:]]*index:/{s/^[[:space:]]*index://;h};/^[[:space:]]*active profile: $/{g;p;q}') + m pacmd set-card-profile "$card" output:analog-stereo + + pactl set-sink-mute @DEFAULT_SINK@ false + rm -f /tmp/ianknap +} + +nap() { + local sink card + sink=$(pactl get-default-sink) + card="${sink%.*}" + card="${card/output/card}" + m pacmd set-card-profile "$card" off + + # clicking on a link in a browser can cause unmute. + # I don't want that. So, use a stronger form of mute + # than this. + #pactl set-sink-mute @DEFAULT_SINK@ true + touch /tmp/ianknap +} + + # systemctl is-enabled / status / cat says nothing, instead theres # some obscure symlink. paths copied from man systemd.unit. # possibly also usefull, but incomplete, doesnt show units not loaded in memory: @@ -2969,7 +3827,13 @@ vpnoffc() { # vpn off client ser stop openvpn-client-tr@client } vpnc() { - ser start openvpn-client-tr@client + local unit + unit=openvpn-client-tr@client + sudo -v + if [[ $(systemctl is-active $unit) != active ]]; then + s systemctl start $unit + sleep 1 + fi } @@ -2982,6 +3846,26 @@ vspicy() { # usage: VIRSH_DOMAIN wian() { cat-new-files /m/4e/INBOX/new } +wakehours() { + local sec + if (( $# != 1 )) ; then + echo wakehours: error: expected 1 arg, got $# >&2 + return 1 + fi + sec=$(( EPOCHSECONDS - $( date +%s -d $1am ) )) + printf "%d:%02d\n" $(( sec / 60 / 60)) $(( (sec / 60) % 60 )) +} + +calvis() { # calendar visualize + install -m 600 /dev/null /tmp/calendar-bytes + while read -r l; do + for char in $l; do + # shellcheck disable=SC2059 # intentional for the hex formatting + printf "\x$(printf "%x" $char)" >>/tmp/calendar-bytes + done + done < <(grep -v '[#-]' /p/calendar-data) + /p/c/proc/calendar/linux-amd64/calendar +} wtr() { curl wttr.in/boston; } @@ -3013,7 +3897,76 @@ 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 -- "$*" $paths /a/t.org /p/w.org /a/work.org ||: +} +reml() { # with limit to 5 matches per file + 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 /a/t.org /p/w.org /a/work.org ||: +} + + +# for use in /f/bind +fupzone() { + # shellcheck disable=SC2046 # i want word splitting + ./update-zone $(i s | sed -rn 's/.*db\.(.*)/\1/p') +} + +# 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 ||: @@ -3132,7 +4085,74 @@ else alias rg=grr fi +# rg with respecting vcs ignore files +rgv() { + ret=0 + # settings that are turned off for pipes, keep them on. + # Found by searching for "terminal" in --help + # --heading + # -n + # + # -. = search dotfiles + # -z = search zipped files + # -i = case insensitive + # -M = max columns + # --no-messages because of annoying errors on broken symlinks + # --no-ignore-parent because i have /a/.git which ignores almost everything under it. + command rg -n --heading -. -z --no-messages -i -M 900 --no-ignore-parent -g '!.git' -g '!auto-save-list' -g '!.savehist' "$@" || ret=$? + return $ret +} + +amall() { + echo "$(tput setaf 5 2>/dev/null ||:)█ coresite █$(tput sgr0 2>/dev/null||:)" + amfsf "$@" + echo "$(tput setaf 5 2>/dev/null ||:)█ office █$(tput sgr0 2>/dev/null||:)" + amoffice "$@" +} +amallq() { # amall quiet + amfsf "$@" + amoffice "$@" +} +amfsf() { + sedi -r '/alertmanager.url/s/@prom.office/@prom/' ~/.config/amtool/config.yml + amtool "$@" +} +amoffice() { + sedi -r '/alertmanager.url/s/@prom.fsf/@prom.office.fsf/' ~/.config/amtool/config.yml + amtool "$@" +} +amls() { + amall silence query "$@" +} +# amtool silence add +amsa() { + amall silence add "$@" +} +# amtool silence force +amsf() { + amall silence add x!="1" +} +amrmall() { + # note: not sure if quoting of this arg is correct + amfsf silence expire "$(amfsf silence query -q)" + amoffice silence expire "$(amoffice silence query -q)" +} + + +youtube-dl-update() { + sudo wget https://yt-dl.org/downloads/latest/youtube-dl -O /usr/local/bin/youtube-dl + sudo chmod a+rx /usr/local/bin/youtube-dl +} + +# https://github.com/yt-dlp/yt-dlp/wiki/Installation +yt-dlp-update() { + sudo curl -L https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp -o /usr/local/bin/yt-dlp + sudo chmod a+rx /usr/local/bin/yt-dlp # Make executable +} +mpvyt() { + mpv --ytdl ytdl_path=/usr/local/bin/yt-dlp "$@" +} # taken from default changes to bashrc and bash_profile path-add --end --ifexists $HOME/.rvm/bin @@ -3140,6 +4160,34 @@ path-add --end --ifexists $HOME/.rvm/bin # so its included in overall env +# ya, hacky hardcoded hostnames in 2023. we could do better +hssh-update() { + local -a failed_hosts hosts + case $HOSTNAME in + sy|kd) + hosts=( + kd x3.office.fsf.org syw + ) + ;; + x3) + hosts=( + b8.nz sywg.b8.nz + ) + ;; + esac + for host in ${hosts[@]}; do + e $host + if ! scp /b/fai/fai/config/files/usr/local/bin/hssh/IANK root@$host:/usr/local/bin/hssh; then + failed_hosts+=($host) + fi + done + if (( ${#failed_hosts[@]} >= 1 )); then + echo failed_hosts=${failed_hosts[*]} + return 1 + fi +} + + export BASEFILE_DIR=/a/bin/fai-basefiles #export ANDROID_HOME=/a/opt/android-home