X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=brc2;h=5035ca2f5c3c348e81524ca034dd1c2db9818d09;hb=95eb9558206f8287febab80dd3f51d168a3ca831;hp=5cd83b2223641705ff2762871aee5b22385f33c4;hpb=2b981100a8b45f117d6f5c165404937f3c917e8f;p=distro-setup diff --git a/brc2 b/brc2 index 5cd83b2..5035ca2 100644 --- a/brc2 +++ b/brc2 @@ -12,6 +12,8 @@ source /a/bin/distro-setup/path-add-function path-add /a/exe # add this with absolute paths as needed for better security #path-add --end /path/to/node_modules/.bin +## for yarn, etc +#path-add --end /usr/lib/node_modules/corepack/shims/ # pip3 --user things go here: path-add --end ~/.local/bin @@ -19,6 +21,15 @@ path-add --ifexists --end /a/work/libremanage path-add --ifexists --end /a/opt/adt-bundle*/tools /a/opt/adt-bundle*/platform-tools path-add --ifexists --end /a/opt/scancode-toolkit-3.10. +case $HOSTNAME in + sy|bo) + # https://askubuntu.com/questions/1254544/vlc-crashes-when-opening-any-file-ubuntu-20-04 + if grep -qE '^VERSION_CODENAME="(nabia|focal)"' /etc/os-release &>/dev/null; then + export MESA_LOADER_DRIVER_OVERRIDE=i965 + fi + ;; +esac + export WCDHOME=/a @@ -48,6 +59,32 @@ fi # * functions +multimic() { + local i + local -a sources + + m pactl unload-module module-loopback + m pactl unload-module module-null-sink + m pactl unload-module module-remap-source + + sources=($(pacmd list-sources | sed -rn 's/.*name: <([^>]+).*/\1/p')) + + if (( ! $# )); then + i=0 + for s in ${sources[@]}; do + e $i $s + i=$(( i+1 )) + done + read -r l + set -- $l + fi + m pactl load-module module-null-sink sink_name=ianinput sink_properties=device.description=ianinputs + for i; do + m pactl load-module module-loopback source=${sources[i]} sink_dont_move=true sink=ianinput + done + pactl load-module module-remap-source source_name=iancombine master=ianinput.monitor source_properties=device.description=iancombine +} + hstest() { install-my-scripts d=$(mktemp -d) @@ -169,8 +206,10 @@ EOF fi sudo chroot $d apt-get update sudo DEBIAN_FRONTEND=noninteractive chroot $d apt-get -y dist-upgrade --purge --auto-remove - sudo DEBIAN_FRONTEND=noninteractive schroot -c $n -- apt-get install --allow-unauthenticated -y ${apps[@]} sudo cp -P {,$d}/etc/localtime + if (( ${#apps[@]} )); then + sudo DEBIAN_FRONTEND=noninteractive schroot -c $n -- apt-get install --allow-unauthenticated -y ${apps[@]} + fi } @@ -379,6 +418,22 @@ bigclock() { nnn() { /a/opt/nnn -H "$@"; } +locat() { # log-once cat + local files + ngset + files=(/var/local/cron-errors/* /home/iank/cron-errors/* /sysd-mail-once-state/*) + case ${#files[@]} in + 0) : ;; + 1) + echo ${files[0]} + head ${files[0]} + ;; + *) + head ${files[@]} + ;; + esac + ngreset +} # duplicated somewhat below. jrun() { # journal run. run args, log to journal, tail and grep the journal. @@ -446,14 +501,16 @@ lipush() { # note, i had --delete-excluded, but that deletes all files in --exclude-from on # the remote site, which doesn't make sense, so not sure why i had it. local p a - p=(/a/opt/{emacs-debian11{,-nox},mu,emacs} /a/bin /a/exe /a/h /a/c /p/c/machine_specific/vps{,.hosts}) + # excluding emacs for now + #p=(/a/opt/{emacs-debian11{,-nox},mu,emacs} /a/bin /a/exe /a/h /a/c /p/c/machine_specific/vps{,.hosts}) + p=(/a/bin /a/exe /a/h /a/c /p/c/machine_specific/vps{,.hosts}) a="-ahviSAXPH --specials --devices --delete --relative --exclude-from=/p/c/li-rsync-excludes" ret=0 for h in li je bk; do - m s rsync "$@" $a ${p[@]} /p/c/machine_specific/$h root@$h.b8.nz:/ || ret=$? - # only li is debian11 - p[0]=/a/opt/emacs-ubuntu20.04 - p[1]=/a/opt/emacs-ubuntu20.04-nox + m s rsync "$@" $a ${p[@]} /p/c/machine_specific/$h root@$h.b8.nz:/ + ## only li is debian11 + #p[0]=/a/opt/emacs-trisuqel10 + #p[1]=/a/opt/emacs-trisquel10-nox done m s rsync "$@" -ahviSAXPH root@li.b8.nz:/a/h/proposed-comments/ /a/h/proposed-comments || ret=$? return $ret @@ -484,27 +541,26 @@ EOF done } bindpushb8() { - dsign iankelling.org expertpathologyreview.com zroe.org amnimal.ninja lipush for h in li bk; do m sl $h <<'EOF' source ~/.bashrc -m dnsup m dnsb8 EOF done } dnsup() { - conflink - m ser reload bind9 + conflink -f + m ser reload named } dnsb8() { local f=/var/lib/bind/db.b8.nz - ser stop bind9 - sudo rm -fv $f.jnl - sudo install -m 644 -o bind -g bind /p/c/machine_specific/vps/bind-initial/db.b8.nz $f - ser restart bind9 + m ser stop named + m sleep 1 + m sudo rm -fv $f.jnl + m sudo install -m 644 -o bind -g bind /p/c/machine_specific/vps/bind-initial/db.b8.nz $f + m ser restart named } dnsecgen() { # keys generated like this @@ -706,6 +762,10 @@ fastboot() { kdecd() { /usr/lib/x86_64-linux-gnu/libexec/kdeconnectd; } +bat() { + cat /sys/class/power_supply/BAT0/capacity +} + # List of apps to install/update # Create from existing manually installed apps by doing # fdroidcl update @@ -954,10 +1014,9 @@ hstatus() { # work log wlog() { local day now i - now=$(date +%s) for (( i=0; i<60; i++ )); do - day=$( date +%F -d @$((now - 86400*i )) ) - date "+%a %b %d" -d @$((now - 86400*i )) | tr '\n' ' ' + 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$' done } @@ -1057,8 +1116,8 @@ Address = 10.8.0.$ipsuf/24 PostUp = ping -c1 10.8.0.1 ||: [Peer] -# li -PublicKey = zePGl7LoS3iv6ziTI/k8BMh4L3iL3K2t9xJheMR4hQA= +# li. called wgmail on that server +PublicKey = CTFsje45qLAU44AbX71Vo+xFJ6rt7Cu6+vdMGyWjBjU= AllowedIPs = 10.8.0.0/24 Endpoint = 72.14.176.105:1194 PersistentKeepalive = 25 @@ -1066,7 +1125,7 @@ EOF umask $umask_orig # old approach. systemd seems to work fine and cleaner. rm -f ../network/interfaces.d/wghole - cedit -q $host /p/c/machine_specific/li/filesystem/etc/wireguard/wghole.conf </dev/null; then + m s mount --bind /root/mount_namespaces /root/mount_namespaces + fi + m s mount --make-private /root/mount_namespaces + if [[ ! -e /root/mount_namespaces/$ns ]]; then + s touch /root/mount_namespaces/$ns + fi + if ! s mountpoint /root/mount_namespaces/$ns >/dev/null; then + m unshare --propagation slave --mount=/root/mount_namespaces/$ns /bin/true + fi + m sudo -E /usr/bin/nsenter --mount=/root/mount_namespaces/$ns "$@" +} + +mnsnonet() { + ns=$1 + if ! s ip netns list | grep -Fx nonet &>/dev/null; then + s ip netns add nonet + fi + mns $ns --net=/var/run/netns/nonet sudo -E -u iank /bin/bash +} + + lom() { local l base if [[ $1 == /* ]]; then @@ -1094,12 +1179,12 @@ lom() { fi fi m sudo mkdir -p /mnt/$base - m sudo mount /dev/mapper/$base /mnt/$base - m sudo chown $USER:$USER /mnt/$base + m mns mount /dev/mapper/$base /mnt/$base + m mns chown $USER:$USER /mnt/$base else base=$1 - if mountpoint /mnt/$base &>/dev/null; then - m sudo umount /mnt/$base + if mns mountpoint /mnt/$base &>/dev/null; then + m mns umount /mnt/$base fi if sudo cryptsetup status /dev/mapper/$base &>/dev/null; then if ! m sudo cryptsetup luksClose /dev/mapper/$base; then @@ -1215,8 +1300,7 @@ allmyirc() { } mygajim() { - local now time time_sec time_pretty - now=$(date +%s) + local time time_sec time_pretty sqlite3 -separator ' ' /p/c/subdir_files/.local/share/gajim/logs.db "select time, message from logs where contact_name = 'iank' and jid_id = 17;" | while read -r time l; do case $time in 16*) : ;; @@ -1229,10 +1313,14 @@ mygajim() { echo $time_pretty "$l" time_sec=${time%%.*} # only look at the last 18 days. generally just use this for timesheet. - if (( time_sec < now - 60 * 60 * 24 * 18 )); then break; fi + if (( time_sec < EPOCHSECONDS - 60 * 60 * 24 * 18 )); then break; fi done } +allmygajim() { + sqlite3 -separator ' ' /p/c/subdir_files/.local/share/gajim/logs.db "select time, message from logs where contact_name = 'iank'" | less +} + gajlogs() { sqlite3 -separator ' ' /p/c/subdir_files/.local/share/gajim/logs.db "select time, message from logs" | less } @@ -1473,7 +1561,6 @@ testmail() { # always run this first, edit the test files, then run the following testsieve() { sieve-filter ~/sieve/maintest.sieve ${1:-INBOX} delete 2> >(head; tail) >/tmp/testsieve.log && sed -rn '/^Performed actions:/,/^[^ ]/{/^ /p}' /tmp/testsieve.log | sort | uniq -c - _dosieve } runsieve() { c ~/sieve; cp personal{test,}.sieve; cp lists{test,}.sieve; cp personalend{test,}.sieve @@ -1487,14 +1574,14 @@ runsieve() { alertme() { if [[ -t 0 ]]; then exim -t <\0,' +} + reset-xscreensaver() { # except for spash, i set these by setting gui options in # xscreensaver-command -demo