X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;ds=sidebyside;f=brc2;h=491dcada8e562e33990a96b50427ab9cf1af16a2;hb=97b78b0003982c6374f4d631694ba2746580cf1f;hp=c233c9288354125d0d679f04deee6ee862666188;hpb=40dd151ec6ba75633c74568da59e35a45351f194;p=distro-setup
diff --git a/brc2 b/brc2
index c233c92..491dcad 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)
@@ -464,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
@@ -513,15 +552,15 @@ EOF
dnsup() {
conflink -f
- m ser reload bind9
+ m ser reload named
}
dnsb8() {
local f=/var/lib/bind/db.b8.nz
- ser stop bind9
- sleep 1
- 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
@@ -723,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
@@ -971,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
}
@@ -1232,8 +1274,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*) : ;;
@@ -1246,10 +1287,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
}
@@ -1647,18 +1692,24 @@ enn() {
sdnbash() { # systemd namespace bash
local unit=$1
- m sudo nsenter -t $(systemctl show --property MainPID --value $unit') -n -m sudo -u $USER -i bash
+ m sudo nsenter -t $(systemctl show --property MainPID --value $unit) -n -m sudo -u $USER -i bash
}
mailnnbash() {
- m sudo nsenter -t $(systemctl show --property MainPID --value mailnn') -n -m sudo -u $USER -i bash
+ m sudo nsenter -t $(systemctl show --property MainPID --value mailnn) -n -m sudo -u $USER -i bash
}
mailvpnbash() {
m sudo nsenter -t $(pgrep -f "/usr/sbin/openvpn .* --config /etc/openvpn/.*mail.conf") -n -m sudo -u $USER -i bash
}
eximbash() {
- m sudo nsenter -t $(pgrep -f "/usr/sbin/exim4 -bd -q30m -C /etc/exim4/my.conf"|h1) -n -m sudo -u $USER -i bash
+ local pid
+ pid=$(pgrep -f "/usr/sbin/exim4 -bd -q30m -C /etc/exim4/my.conf"|h1)
+ if [[ ! $pid ]]; then
+ echo "eximbash: failed to find exim pid. systemctl -n 30 status exim4:"
+ systemctl status exim4
+ fi
+ m sudo nsenter -t $pid -n -m
}
spamnn() {
local spamdpid
@@ -1706,9 +1757,13 @@ vpncmd() {
m sudo -E env "PATH=$PATH" nsenter -t $(pgrep -f "/usr/sbin/openvpn .* --config /etc/openvpn/.*client.conf") -n -m "$@"
}
vpnf() {
- vpncmd sudo -E -u iank env "PATH=$PATH" abrowser -no-remote -P vpn & r
+ sudo -v
+ vpncmd sudo -E -u iank env "PATH=$PATH" abrowser -no-remote -P vpn &
+ sleep 5
+ r
}
vpn2f() {
+ sudo -v
vpncmd sudo -u iank env "PATH=$PATH" abrowser -no-remote -P vpn2 & r
}
@@ -1741,7 +1796,7 @@ vpn() {
sudo systemd-tty-ask-password-agent
}
-ufix() {
+fixu() {
ls -lad /run/user/1000
s chmod 700 /run/user/1000; s chown iank.iank /run/user/1000
}
@@ -1864,7 +1919,15 @@ if [[ -e $f ]]; then
source $f
fi
-
+electrum() {
+ # https://electrum.readthedocs.io/en/latest/tor.html
+ # https://github.com/spesmilo/electrum-docs/issues/129
+ s rsync -ptog --chown bitcoin:bitcoin ~/.Xauthority /var/lib/bitcoind/.Xauthority
+ sudo -u bitcoin DISPLAY=$DISPLAY XAUTHORITY=/var/lib/bitcoind/.Xauthority /a/opt/electrum-4.2.1-x86_64.AppImage -p socks5:localhost:9050
+}
+monero() {
+ sudo -u bitcoin DISPLAY=$DISPLAY XAUTHORITY=/var/lib/bitcoind/.Xauthority /a/opt/monero-gui-v0.17.3.2/monero-wallet-gui
+}
reset-konsole() {
@@ -1891,6 +1954,12 @@ scrollbar true
EOF
}
+# make a page of links found in the files $@. redirect output
+linkhtml() {
+ gr -oh 'https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&//=]*)' "$@" | \
+ rev | sort -u | rev | sed 's,.*,\0
,'
+}
+
reset-xscreensaver() {
# except for spash, i set these by setting gui options in
# xscreensaver-command -demo