various improvements

diff --git a/.bashrc b/.bashrc
index 83b54d3c5341177405b87eb1b7bfdcd448b79a16..caa13ebfc5fd21dded41f367fb2aab196dea946e 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -1,4 +1,12 @@
 #!/bin/bash
 #!/bin/bash

+
+# perl package manager put this here?
+# PATH="/home/iank/perl5/bin${PATH:+:${PATH}}"; export PATH;
+# PERL5LIB="/home/iank/perl5/lib/perl5${PERL5LIB:+:${PERL5LIB}}"; export PERL5LIB;
+# PERL_LOCAL_LIB_ROOT="/home/iank/perl5${PERL_LOCAL_LIB_ROOT:+:${PERL_LOCAL_LIB_ROOT}}"; export PERL_LOCAL_LIB_ROOT;
+# PERL_MB_OPT="--install_base \"/home/iank/perl5\""; export PERL_MB_OPT;
+# PERL_MM_OPT="INSTALL_BASE=/home/iank/perl5"; export PERL_MM_OPT;
+

 # I, Ian Kelling, follow the GNU license recommendations at
 # https://www.gnu.org/licenses/license-recommendations.en.html. They
 # recommend that small programs, < 300 lines, be licensed under the
 # I, Ian Kelling, follow the GNU license recommendations at
 # https://www.gnu.org/licenses/license-recommendations.en.html. They
 # recommend that small programs, < 300 lines, be licensed under the

diff --git a/.dataprinter b/.dataprinter
new file mode 100644 (file)
index 0000000..09d23f5
--- /dev/null
+++ b/.dataprinter
@@ -0,0 +1,38 @@
+
+multiline = 0
+# i like it, but it randomly got mostly stuck on bright blue.
+theme = Solarized
+#colored = 0
+
+
+show_dualvar = off
+caller_message_newline = 0
+print_escapes = 0
+
+
+# testing. not sure if I want htis.
+show_reftype = 1
+
+# recommended by the manual.
+filters = DateTime
+
+# copied docs of use_prototypes:
+# p { foo => 1 };   # works, but now p(@foo) will fail, you must always pass a ref,
+# e.g. p(\@foo)
+# end docs. Looking in the source code,
+# we don't need reference for single arguments. But
+# beware that lists automatically become multiple arguments.
+use_prototypes = 0
+
+caller_info = 1
+
+theme = Iank
+
+caller_message = __FILENAME__:__LINE__
+
+scalar_quotes = '
+
+string_max = 400000
+array_max = 400
+hash_max = 400
+string_overflow = (.IANK-DDP.. __SKIPPED__ chars...)

diff --git a/.psqlrc b/.psqlrc
new file mode 100644 (file)
index 0000000..f59b3a2
--- /dev/null
+++ b/.psqlrc
@@ -0,0 +1,2 @@
+-- wraps long columns. so nice.
+\pset format wrapped

diff --git a/beet-data b/beet-data
index 19acc31e01cb0effa261a60efe2ba87653ac9ccd..681c5b2bdde3f42bf51967c3ab496b7fa9fad510 100644 (file)
--- a/beet-data
+++ b/beet-data
@@ -131,7 +131,7 @@ beetapl() { # beet add playlist
   name="$1"
   shift
   # shellcheck disable=SC2034 # unused from beetag, don't care for now.
   name="$1"
   shift
   # shellcheck disable=SC2034 # unused from beetag, don't care for now.

-  bpla[$name]="${*@Q}"
+  bpla[$name]="$*"

 }
 
 
 }
 
 

diff --git a/beetag b/beetag
index f06d9e62d2b93d80dca7e1ae25a5ba3b1fca98ce..456b343e31e67017638fe708d23c10ab12d59515 100755 (executable)
--- a/beetag
+++ b/beetag
@@ -24,6 +24,17 @@
 # otherwise it is redundant.
 #. /a/c/fsf-script-lib
 
 # otherwise it is redundant.
 #. /a/c/fsf-script-lib
 

+
+# todo: what the hell is going on here: I think I accidentally pressed r
+# for rock, then wanted to set it back, so I pressed the button for
+# dance.
+#
+#beetmq id:19324 rock=t
+#  rock: t
+#beetmq id:19324 genre=dance
+#No changes to make.
+
+

 # Must be called from beetag for variables to be setup
 beetag-help() {
   source /a/bin/ds/beet-data
 # Must be called from beetag for variables to be setup
 beetag-help() {
   source /a/bin/ds/beet-data

diff --git a/brc b/brc
index c6016e310bad60a3c8ff02d83010566e1e220198..4f10254de99c27eec46b1da9b967f90a8e5fe9b6 100644 (file)
--- a/brc
+++ b/brc
@@ -82,6 +82,15 @@ shopt -s extglob
 # setting this also sets dotglob.
 export GLOBIGNORE="*/.:*/.."
 
 # setting this also sets dotglob.
 export GLOBIGNORE="*/.:*/.."
 

+
+
+PATH="/home/iank/perl5/bin${PATH:+:${PATH}}"; export PATH;
+PERL5LIB="/home/iank/perl5/lib/perl5${PERL5LIB:+:${PERL5LIB}}"; export PERL5LIB;
+PERL_LOCAL_LIB_ROOT="/home/iank/perl5${PERL_LOCAL_LIB_ROOT:+:${PERL_LOCAL_LIB_ROOT}}"; export PERL_LOCAL_LIB_ROOT;
+PERL_MB_OPT="--install_base \"/home/iank/perl5\""; export PERL_MB_OPT;
+PERL_MM_OPT="INSTALL_BASE=/home/iank/perl5"; export PERL_MM_OPT;
+
+

 # Useful info. see man bash.
 PS4='$LINENO+ '
 
 # Useful info. see man bash.
 PS4='$LINENO+ '
 


@@ -3742,12 +3751,6 @@ EOF
   done
 }
 
   done
 }
 

-# note, there is also the tool gron which is meant for this, but
-# this is good enough to not bother installing another tool
-jq-lines() {
-  # https://stackoverflow.com/questions/59700329/how-to-print-path-and-key-values-of-json-file-using-jq
-  jq --stream -r 'select(.[1]|scalars!=null) | "\(.[0]|join(".")): \(.[1]|tojson)"' "$@"
-}

 
 tsr() { # ts run
   "$@" |& ts || return $?
 
 tsr() { # ts run
   "$@" |& ts || return $?

diff --git a/brc2 b/brc2
index 7fba7a0d6c5b5e445c5be3b47eb76503748c7e15..df9e17ee3d20f5f0ff42b7ab992b6d7bf4c17485 100644 (file)
--- a/brc2
+++ b/brc2
@@ -600,6 +600,8 @@ EOF
 # beet playlist. use beetag with a playlist name
 bpl() {
   local playlist playlist_regex
 # beet playlist. use beetag with a playlist name
 bpl() {
   local playlist playlist_regex

+  local -i i=1
+  local -a args

   case $1 in
     -h|--help)
       for playlist in "${!bpla[@]}"; do
   case $1 in
     -h|--help)
       for playlist in "${!bpla[@]}"; do


@@ -609,14 +611,22 @@ bpl() {
       ;;
   esac
 
       ;;
   esac
 

-  playlist="${*: -1}"
+  for arg; do
+    if (( i == $# )); then
+      playlist="$arg"
+      break
+    fi
+    args+=("$arg")
+    i+=1
+  done
+

   playlist_regex='[a-z0-9_]'
   if [[ ! $playlist =~ $playlist_regex ]]; then
     echo "bpl: error unexpected chars in playlist: $playlist"
     return 1
   fi
   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
-  e beetag -r "${*:1:$# - 1}" "${bpla[$playlist]}"
+
+  beetag -r "${args[@]}" ${bpla[$playlist]}

 }
 complete -W "${!bpla[*]}" bpl
 
 }
 complete -W "${!bpla[*]}" bpl
 


@@ -733,9 +743,9 @@ beetconvert-rm-extras() {
   # eg, previously rated > 1, now rated 1.
   while read -r l; do
     convertedpath="/i/converted${l#/i/m}"
   # eg, previously rated > 1, now rated 1.
   while read -r l; do
     convertedpath="/i/converted${l#/i/m}"

-    case $convertedpath in
-      *.flac) convertedpath="${convertedpath%.flac}.mp3" ;;
-    esac
+    if [[ $convertedpath == *.flac ]]; then
+      convertedpath="${convertedpath%.flac}.mp3"
+    fi

     paths[$convertedpath]=t
   done <"$tmpf"
 
     paths[$convertedpath]=t
   done <"$tmpf"
 


@@ -853,13 +863,11 @@ beegenre() {
   local count artist artregex genre singleartist tmpf tmpf2
   local -a artists genres
   singleartist=false
   local count artist artregex genre singleartist tmpf tmpf2
   local -a artists genres
   singleartist=false

-  case $1 in
-    artist:*)
-      singleartist=true
-      artist="$1"
-      shift
-      ;;
-  esac
+  if [[ $1 == artist:* ]]; then
+    singleartist=true
+    artist="$1"
+    shift
+  fi

   tmpf=$(mktemp)
   tmpf2=$(mktemp)
   if $singleartist; then
   tmpf=$(mktemp)
   tmpf2=$(mktemp)
   if $singleartist; then


@@ -882,13 +890,11 @@ beegenre() {
       fi
     done <$tmpf
     read -r -N 1 -s -p "Y/n " char
       fi
     done <$tmpf
     read -r -N 1 -s -p "Y/n " char

-    case $char in
-      [Yy$'\n'])
-        for (( i=0; i<${#artists[@]}; i++ )); do
-          beet modify -y "$@"  "artist::^${artists[i]}$" genre=${genre[i]}
-        done
-        ;;
-    esac
+    if [[ $char == [Yy$'\n'] ]]; then
+      for (( i=0; i<${#artists[@]}; i++ )); do
+        beet modify -y "$@"  "artist::^${artists[i]}$" genre=${genre[i]}
+      done
+    fi

   fi
   rm $tmpf
 }
   fi
   rm $tmpf
 }


@@ -1275,7 +1281,7 @@ dsign() {
   local arg
   for arg; do
     local zone=${arg#db.}
   local arg
   for arg; do
     local zone=${arg#db.}

-    local dir=/p/c/machine_specific/vps/filesystem/var/lib/bind
+    local dir=/p/c/user-specific/bind/var/lib/bind

     dnssec-signzone -S -e +31536000 -o $zone -K $dir -d $dir $dir/db.$zone
   done
 }
     dnssec-signzone -S -e +31536000 -o $zone -K $dir -d $dir $dir/db.$zone
   done
 }


@@ -2312,9 +2318,9 @@ EOF
   } | u /p/c/dnsmasq-data
 
 
   } | u /p/c/dnsmasq-data
 
 

-  b8_ip=$(dig +short b8.nz @iankelling.org | tail -1)
+  #b8_ip=$(dig +short b8.nz @iankelling.org | tail -1)

   # if our dynamic ip updates broke, set manually, eg:
   # if our dynamic ip updates broke, set manually, eg:

-  #b8_ip=72.74.193.xxx
+  b8_ip=108.26.192.250  # 72.74.193.xxx

   if [[ ! $b8_ip ]]; then
     b8_ip=$(curl --connect-timeout 10 -s4 https://iankelling.org/cgi/pubip)
   fi
   if [[ ! $b8_ip ]]; then
     b8_ip=$(curl --connect-timeout 10 -s4 https://iankelling.org/cgi/pubip)
   fi


@@ -2992,14 +2998,10 @@ myprof() {
 # especially for links.
 profr() {
   source /p/c/domain-info
 # especially for links.
 profr() {
   source /p/c/domain-info

-  case $HOSTNAME in
-    $d_host)
-      profr-local
-      ;;
-    *)
-      ssh b8.nz profr-local
-      ;;
-  esac
+  if [[ $HOSTNAME == $d_host ]]; then
+  else
+    ssh b8.nz profr-local
+  fi

 }
 
 profr-local() {
 }
 
 profr-local() {


@@ -3943,58 +3945,50 @@ sysd-deps() {
   local -a dirs search
   ngset
 
   local -a dirs search
   ngset
 

-  case $1 in
-    u)
-      search=(
-        ~/.config/systemd/user.control/*
-        $XDG_RUNTIME_DIR/systemd/user.control/*
-        $XDG_RUNTIME_DIR/systemd/transient/*
-        $XDG_RUNTIME_DIR/systemd/generator.early/*
-        ~/.config/systemd/user/*
-        /etc/systemd/user/*
-        $XDG_RUNTIME_DIR/systemd/user/*
-        /run/systemd/user/*
-        $XDG_RUNTIME_DIR/systemd/generator/*
-        ~/.local/share/systemd/user/*
-        /usr/lib/systemd/user/*
-        $XDG_RUNTIME_DIR/systemd/generator.late/*
-      )
-      ;;
-    *)
-      search=(
-        /etc/systemd/system.control/*
-        /run/systemd/system.control/*
-        /run/systemd/transient/*
-        /run/systemd/generator.early/*
-        /etc/systemd/system/*
-        /etc/systemd/systemd.attached/*
-        /run/systemd/system/*
-        /run/systemd/systemd.attached/*
-        /run/systemd/generator/*
-        /lib/systemd/system/*
-        /run/systemd/generator.late/*
-      )
-      ;;
-  esac
+  if [[ $1 == u ]]; then
+    search=(
+      ~/.config/systemd/user.control/*
+      $XDG_RUNTIME_DIR/systemd/user.control/*
+      $XDG_RUNTIME_DIR/systemd/transient/*
+      $XDG_RUNTIME_DIR/systemd/generator.early/*
+      ~/.config/systemd/user/*
+      /etc/systemd/user/*
+      $XDG_RUNTIME_DIR/systemd/user/*
+      /run/systemd/user/*
+      $XDG_RUNTIME_DIR/systemd/generator/*
+      ~/.local/share/systemd/user/*
+      /usr/lib/systemd/user/*
+      $XDG_RUNTIME_DIR/systemd/generator.late/*
+    )
+  else
+    search=(
+      /etc/systemd/system.control/*
+      /run/systemd/system.control/*
+      /run/systemd/transient/*
+      /run/systemd/generator.early/*
+      /etc/systemd/system/*
+      /etc/systemd/systemd.attached/*
+      /run/systemd/system/*
+      /run/systemd/systemd.attached/*
+      /run/systemd/generator/*
+      /lib/systemd/system/*
+      /run/systemd/generator.late/*
+    )
+  fi

   for f in "${search[@]}"; do
     [[ -d $f ]] || continue
   for f in "${search[@]}"; do
     [[ -d $f ]] || continue

-    case $f in
-      *.requires|*.wants)
-        dirs+=("$f")
-        ;;
-    esac
+    if [[ $f == *.requires || $f == *.wants ]]; then
+      dirs+=("$f")
+    fi

   done
   # dirs is just so we write out the directory names, ls does it when there is 2 or more dirs.
   done
   # dirs is just so we write out the directory names, ls does it when there is 2 or more dirs.

-  case ${#dirs[@]} in
-    1)
-      echo "${dirs[0]}:"
-      ll "${dirs[@]}"
-      ;;
-    0) : ;;
-    *)
-      ll "${dirs[@]}"
-      ;;
-  esac
+  dirc=${#dirs[@]}
+  if (( dirc == 1 )); then
+    echo "${dirs[0]}:"
+    ll "${dirs[@]}"
+  elif (( dirc != 0 )); then
+    ll "${dirs[@]}"
+  fi

   ngreset
 }
 
   ngreset
 }
 


@@ -4894,3 +4888,13 @@ fi
 
 # ensure no bad programs appending to this file will have an affect
 return 0
 
 # ensure no bad programs appending to this file will have an affect
 return 0

+
+
+# finding the letter pages that have hardly any text due to overflow:
+letter-hac-fsf() {
+  pdftotext ISAL.pdf
+  awk 'BEGIN {page=1; words=0}
+/\f/ {print  words, page; page++; words=0; next}
+{words += NF}
+END {print  words, page}' ISAL.txt | sort -n
+}

diff --git a/distro-end b/distro-end
index 8a4a4e5359fa6e8d076e08cf197843abd7f9a314..037b66e921375f6383a3e4fead65ddb032e6e8a5 100755 (executable)
--- a/distro-end
+++ b/distro-end
@@ -1028,7 +1028,12 @@ Type=oneshot
 # about 24 hours of failures
 # it copies over its files without respecting symlinks, so
 # we pass options to use different location.
 # about 24 hours of failures
 # it copies over its files without respecting symlinks, so
 # we pass options to use different location.

-ExecStart=/usr/local/bin/sysd-mail-once -288 rss2email r2e -d /p/c/rss2email.json -c /p/c/rss2email.cfg run
+
+# Todo: we should wrap this in a script which ignores
+# persistent errors about parsing html. Not reporting any errors with sysd-mail-once until then.
+# Systemd also has an output filtering mechanism, we could try that.
+ExecStart=r2e -d /p/c/rss2email.json -c /p/c/rss2email.cfg run
+#ExecStart=/usr/local/bin/sysd-mail-once -288 rss2email r2e -d /p/c/rss2email.json -c /p/c/rss2email.cfg run

 EOF
   sd /etc/systemd/system/rss2email.timer <<'EOF'
 [Unit]
 EOF
   sd /etc/systemd/system/rss2email.timer <<'EOF'
 [Unit]


@@ -1038,7 +1043,7 @@ Description=rss2email
 # for initial run. required.
 OnActiveSec=30
 # for subsequent runs.
 # for initial run. required.
 OnActiveSec=30
 # for subsequent runs.

-OnUnitInactiveSec=300
+OnUnitInactiveSec=3000

 
 [Install]
 WantedBy=timers.target
 
 [Install]
 WantedBy=timers.target

diff --git a/distro-pkgs b/distro-pkgs
index 5960bf8409ec5011475008915f15c83c6c0ef208..ba44bfadca969c256954ada8ff85666ea73ba97a 100755 (executable)
--- a/distro-pkgs
+++ b/distro-pkgs
@@ -205,14 +205,6 @@ case $distro in
   # others unknown
 esac
 
   # others unknown
 esac
 

-case $distro in
-  ubuntu|debian)
-    e spacefm-gtk3 ;;
-  arch)
-    e spacefm ;;
-esac
-
-

 case $(debian-codename) in
   aramo)
     e ncal ;;
 case $(debian-codename) in
   aramo)
     e ncal ;;

diff --git a/filesystem/etc/perl/Data/Printer/Theme/Iank.pm b/filesystem/etc/perl/Data/Printer/Theme/Iank.pm
new file mode 100644 (file)
index 0000000..f15ae81
--- /dev/null
+++ b/filesystem/etc/perl/Data/Printer/Theme/Iank.pm
@@ -0,0 +1,82 @@
+package Data::Printer::Theme::Iank;
+# inspired by Mattia Astorino's Iank theme:
+# https://github.com/material-theme/vsc-material-theme
+use strict;
+use warnings;
+
+sub colors {
+    my %code_for = (
+        base03  => '#1c1c1c', # '#002b36'
+        base02  => '#262626', # '#073642'
+        base01  => '#585858', # '#586e75'
+        base00  => '#626262', # '#657b83'
+        base0   => '#808080', # '#839496'
+        base1   => '#8a8a8a', # '#93a1a1'
+        base2   => '#e4e4e4', # '#eee8d5'
+        base3   => '#ffffd7', # '#fdf6e3'
+        yellow  => '#af8700', # '#b58900'
+        orange  => '#d75f00', # '#cb4b16'
+        red     => '#d70000', # '#dc322f'
+        magenta => '#af005f', # '#d33682'
+        violet  => '#5f5faf', # '#6c71c4'
+        blue    => '#0087ff', # '#268bd2'
+        cyan    => '#00afaf', # '#2aa198'
+        green   => '#5f8700', # '#859900'
+    );
+
+    return {
+        array       => $code_for{violet},  # array index numbers
+        number      => $code_for{cyan}, # numbers
+        string      => $code_for{magenta}, # strings
+        class       => $code_for{yellow},  # class names
+        method      => $code_for{orange},  # method names
+        undef       => $code_for{red},  # the 'undef' value
+        hash        => $code_for{green},  # hash keys
+        regex       => $code_for{orange},  # regular expressions
+        code        => $code_for{base2},  # code references
+        glob        => $code_for{blue},  # globs (usually file handles)
+        vstring     => $code_for{base1},  # version strings (v5.16.0, etc)
+        lvalue      => $code_for{green},  # lvalue label
+        format      => $code_for{green},  # format type
+        true        => $code_for{blue},   # boolean type (true)
+        false       => $code_for{blue},   # boolean type (false)
+        repeated    => $code_for{red},    # references to seen values
+        caller_info => $code_for{undef},   # details on what's being printed
+        weak        => $code_for{violet},  # weak references flag
+        tainted     => $code_for{violet},  # tainted flag
+        unicode     => $code_for{magenta},  # utf8 flag
+        escaped     => $code_for{red},  # escaped characters (\t, \n, etc)
+        brackets    => $code_for{base0},  # (), {}, []
+        separator   => $code_for{base0},  # the "," between hash pairs, array elements, etc
+        quotes      => $code_for{'base0'},
+        unknown     => $code_for{red},  # any (potential) data type unknown to Data::Printer
+    };
+
+}
+
+1;
+__END__
+
+=head1 NAME
+
+Data::Printer::Theme::Iank - Iank theme for DDP
+
+=head1 SYNOPSIS
+
+In your C<.dataprinter> file:
+
+    theme = Iank
+
+Or during runtime:
+
+    use DDP theme => 'Iank';
+
+=head1 DESCRIPTION
+
+This module implements the Iank theme for Data::Printer.
+
+=head1 SEE ALSO
+
+L<Data::Printer>
+
+L<Data::Printer::Theme>

diff --git a/machine_specific/frodo/filesystem/etc/btrbk/r3.conf b/machine_specific/frodo/filesystem/etc/btrbk/r3.conf
index 4b293e73066bd49531c7e283a0bb20484c439595..b228d82f2d856f7ae891d16251f52bfbbdb02221 100644 (file)
--- a/machine_specific/frodo/filesystem/etc/btrbk/r3.conf
+++ b/machine_specific/frodo/filesystem/etc/btrbk/r3.conf
@@ -18,4 +18,3 @@ volume /mnt/r3
 subvolume d-r3
 subvolume siterip
 subvolume ar
 subvolume d-r3
 subvolume siterip
 subvolume ar

-subvolume roverflow

diff --git a/machine_specific/frodo/filesystem/etc/btrbk/r4.conf b/machine_specific/frodo/filesystem/etc/btrbk/r4.conf
new file mode 100644 (file)
index 0000000..4c59d49
--- /dev/null
+++ b/machine_specific/frodo/filesystem/etc/btrbk/r4.conf
@@ -0,0 +1,18 @@
+transaction_syslog local7
+
+lockfile                   /var/lock/btrbk-r4.lock
+
+timestamp_format long-iso
+
+snapshot_create onchange
+
+snapshot_preserve 18h 14d 8w 12m
+snapshot_preserve_min 2d
+snapshot_dir btrbk
+
+target_preserve 18h 14d 8w 12m
+target_preserve_min 2d
+
+rate_limit no
+volume /mnt/r4
+subvolume roverflow

diff --git a/machine_specific/frodo/filesystem/etc/systemd/system/btrbkr.timer b/machine_specific/frodo/filesystem/etc/systemd/system/btrbkr.timer
index 0f0fbd440099b52bc67e8eaf1ca73e3ae83fe7a9..e3b9e9ca77e2566653137abee3dbc8c72ea5ff09 100644 (file)
--- a/machine_specific/frodo/filesystem/etc/systemd/system/btrbkr.timer
+++ b/machine_specific/frodo/filesystem/etc/systemd/system/btrbkr.timer
@@ -2,7 +2,7 @@
 Description=Btrbk r to rust timer
 
 [Timer]
 Description=Btrbk r to rust timer
 
 [Timer]

-OnCalendar=*-*-* 05:00:00 America/New_York
+OnCalendar=*-*-* 15:00:00 America/New_York

 
 [Install]
 WantedBy=timers.target
 
 [Install]
 WantedBy=timers.target

diff --git a/machine_specific/frodo/filesystem/etc/systemd/system/btrbkr2.timer b/machine_specific/frodo/filesystem/etc/systemd/system/btrbkr2.timer
index 77bb04a03db664bfb62fbed6a73540ecf96e6f42..342f3020011eea3a13ae8e8d4c034d54f2ba343b 100644 (file)
--- a/machine_specific/frodo/filesystem/etc/systemd/system/btrbkr2.timer
+++ b/machine_specific/frodo/filesystem/etc/systemd/system/btrbkr2.timer
@@ -2,7 +2,7 @@
 Description=Btrbk r2 timer
 
 [Timer]
 Description=Btrbk r2 timer
 
 [Timer]

-OnCalendar=*-*-* 07:00:00 America/New_York
+OnCalendar=*-*-* 13:00:00 America/New_York

 
 [Install]
 WantedBy=timers.target
 
 [Install]
 WantedBy=timers.target

diff --git a/machine_specific/frodo/filesystem/etc/systemd/system/btrbkr3.timer b/machine_specific/frodo/filesystem/etc/systemd/system/btrbkr3.timer
index 8db2086d43faa67670855961f8e786383e637d85..27d344c5d3362b824e4c9bc74a942e5c185dcca4 100644 (file)
--- a/machine_specific/frodo/filesystem/etc/systemd/system/btrbkr3.timer
+++ b/machine_specific/frodo/filesystem/etc/systemd/system/btrbkr3.timer
@@ -2,7 +2,7 @@
 Description=Btrbk r3 timer
 
 [Timer]
 Description=Btrbk r3 timer
 
 [Timer]

-OnCalendar=*-*-* 07:00:00 America/New_York
+OnCalendar=*-*-* 09:00:00 America/New_York

 
 [Install]
 WantedBy=timers.target
 
 [Install]
 WantedBy=timers.target

diff --git a/machine_specific/frodo/filesystem/etc/systemd/system/btrbkr4.service b/machine_specific/frodo/filesystem/etc/systemd/system/btrbkr4.service
new file mode 100644 (file)
index 0000000..54890b4
--- /dev/null
+++ b/machine_specific/frodo/filesystem/etc/systemd/system/btrbkr4.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=Btrbk to r3
+After=multi-user.target
+
+[Service]
+Type=oneshot
+ExecStart=/usr/local/bin/sysd-mail-once btrbkr3 btrbk -c /etc/btrbk/r3.conf run

diff --git a/machine_specific/frodo/filesystem/etc/systemd/system/btrbkr4.timer b/machine_specific/frodo/filesystem/etc/systemd/system/btrbkr4.timer
new file mode 100644 (file)
index 0000000..5e6b070
--- /dev/null
+++ b/machine_specific/frodo/filesystem/etc/systemd/system/btrbkr4.timer
@@ -0,0 +1,8 @@
+[Unit]
+Description=Btrbk r4 timer
+
+[Timer]
+OnCalendar=*-*-* 11:00:00 America/New_York
+
+[Install]
+WantedBy=timers.target

diff --git a/machine_specific/frodo/filesystem/etc/systemd/system/btrbkrbackup.service b/machine_specific/frodo/filesystem/etc/systemd/system/btrbkrbackup.service
index 122291f316c3955b310b3195375436f7f6b2403b..849d7f1faf1a266bf1758ba7809cdb3151510a32 100644 (file)
--- a/machine_specific/frodo/filesystem/etc/systemd/system/btrbkrbackup.service
+++ b/machine_specific/frodo/filesystem/etc/systemd/system/btrbkrbackup.service
@@ -1,5 +1,5 @@
 [Unit]
 [Unit]

-Description=Btrbk to rbackup
+Description=Snapshot subvolumes that have a primary location in /mnt/rbackup

 After=multi-user.target
 
 [Service]
 After=multi-user.target
 
 [Service]

diff --git a/machine_specific/frodo/filesystem/etc/systemd/system/btrbkrbackup.timer b/machine_specific/frodo/filesystem/etc/systemd/system/btrbkrbackup.timer
index d110eeef756415998310a7848b047fd88734ac81..051ec8c90e337e0f9702d084c72bd734458e0545 100644 (file)
--- a/machine_specific/frodo/filesystem/etc/systemd/system/btrbkrbackup.timer
+++ b/machine_specific/frodo/filesystem/etc/systemd/system/btrbkrbackup.timer
@@ -2,7 +2,7 @@
 Description=Btrbk rbackup timer
 
 [Timer]
 Description=Btrbk rbackup timer
 
 [Timer]

-OnCalendar=*-*-* 07:00:00 America/New_York
+OnCalendar=*-*-* 17:00:00 America/New_York

 
 [Install]
 WantedBy=timers.target
 
 [Install]
 WantedBy=timers.target

diff --git a/mail-setup b/mail-setup
index d95b441ba4467c1640d18ead37f1e80cc66b418d..9b56707d35a2837152a50bf58024a7efcc7b574b 100755 (executable)
--- a/mail-setup
+++ b/mail-setup
@@ -1130,6 +1130,8 @@ fi
 u /etc/spamassassin/mylocal.cf <<'EOF'
 # this is mylocal.cf because the normal local.cf has a bunch of upstream stuff i dont want to mess with
 
 u /etc/spamassassin/mylocal.cf <<'EOF'
 # this is mylocal.cf because the normal local.cf has a bunch of upstream stuff i dont want to mess with
 

+# get rid of syslog spam: spamd[159554]: check: dns_block_rule RCVD_IN_VALIDITY_SAFE_BLOCKED hit, creating /root/.spamassassin/dnsblock_sa-accredit.habeas.com (This means DNSBL blocked you due to too many queries. Set all affected rules score to 0, or use "dns_query_restriction deny sa-accredit.habeas.com" to disable queries)
+dns_query_restriction deny sa-accredit.habeas.com

 
 # /usr/share/doc/exim4-base/README.Debian.gz:
 #   SpamAssassin's default report should not be used in a add_header
 
 # /usr/share/doc/exim4-base/README.Debian.gz:
 #   SpamAssassin's default report should not be used in a add_header


@@ -1155,15 +1157,14 @@ case $HOSTNAME in
     ;;
 esac
 
     ;;
 esac
 

-u /etc/default/spamassassin <<EOF
-# defaults plus debugging flags for an issue im having
-OPTIONS="--create-prefs --max-children 5 --helper-home-dir${spamd_listen_arg}"
+u /etc/default/spamd <<EOF
+# defaults plus the spamd_list thing, and turn off its syslog logging which I'm annoyed at.
+
+OPTIONS="-s null --create-prefs --max-children 5 --helper-home-dir${spamd_listen_arg}"

 PIDFILE="/run/spamd.pid"
 # my additions
 NICE="--nicelevel 15"
 PIDFILE="/run/spamd.pid"
 # my additions
 NICE="--nicelevel 15"

-# not used in t12+, that uses
-# /usr/lib/systemd/system/spamassassin-maintenance.timer
-CRON=1
+

 EOF
 
 case $HOSTNAME in
 EOF
 
 case $HOSTNAME in


@@ -2382,7 +2383,12 @@ EOF
     {
 
       if [[ $HOSTNAME == "$MAIL_HOST" ]]; then
     {
 
       if [[ $HOSTNAME == "$MAIL_HOST" ]]; then

+        # begin dovecot settings

         cat <<'EOF'
         cat <<'EOF'

+listen = 127.0.0.1, ::1, 10.8.0.4
+
+info_log_path = /dev/null
+

 ssl_cert = </etc/exim4/fullchain.pem
 ssl_key = </etc/exim4/privkey.pem
 EOF
 ssl_cert = </etc/exim4/fullchain.pem
 ssl_key = </etc/exim4/privkey.pem
 EOF

diff --git a/mailtest-check b/mailtest-check
index a1132c9cc3869e0ebf4adf954681a28759a5a234..23d1e23476e6a77dfc368b713d831568b0e414c4 100755 (executable)
--- a/mailtest-check
+++ b/mailtest-check
@@ -60,6 +60,51 @@ parse-rspamd() {
   awk '$1 == "Symbol:" && $2 !~ /\(0\.00\)/ && $3 !~ /\(0\.00\)/ {print $2}' | sed 's/(.*//'
 }
 
   awk '$1 == "Symbol:" && $2 !~ /\(0\.00\)/ && $3 !~ /\(0\.00\)/ {print $2}' | sed 's/(.*//'
 }
 

+deactivated_sshd=false
+lock_check_fails=0
+
+maybe-toggle-ssh() {
+
+  # something went wrong in this case.
+  if (( lock_check_fails >= 20 )); then
+    systemctl enable --now ssh.socket
+    systemctl start ssh.service
+  fi
+  export DISPLAY=:0
+  export XAUTHORITY=/home/iank/.Xauthority
+
+  if ! lock_info=$(xscreensaver-command -time 2>/dev/null); then
+    lock_check_fails+=1
+    return 0
+  fi
+
+  lock_or_unlock_time=$(echo "$lock_info" | grep -o 'since.*' | sed 's/since //')
+  lock_or_unlock_time=$(date -d "$lock_or_unlock_time" +%s 2>/dev/null ||:)
+  uint_regex='^[0-9]+$'
+  if [[ ! $lock_or_unlock_time =~ $uint_regex ]]; then
+    lock_check_fails+=1
+    return 0
+  fi
+  lock_check_fails=0
+
+  if [[ $lock_info == *non-blanked* ]]; then
+    if ! $deactivated_sshd; then
+      deactivated_sshd=true
+      if systemctl is-active ssh; then
+        systemctl disable --now ssh.socket
+        systemctl stop ssh.service
+      fi
+    fi
+    # if its been blanked more than a few minutes while I'm afk turn ssh back on.
+  elif $deactivated_sshd && (( EPOCHSECONDS - lock_or_unlock_time > 60 * 2 )); then
+    deactivated_sshd=false
+    if ! systemctl is-active ssh; then
+      systemctl enable --now ssh.socket
+      systemctl start ssh.service
+    fi
+  fi
+}
+

 rspamc-process() {
 
   # note, this could in theory break since we aren't limiting it to the
 rspamc-process() {
 
   # note, this could in theory break since we aren't limiting it to the


@@ -439,6 +484,7 @@ loop-main() {
   sleep 10
   while true; do
     premain_sec=$EPOCHSECONDS
   sleep 10
   while true; do
     premain_sec=$EPOCHSECONDS

+    maybe-toggle-ssh

     main
     maini=$((maini + 1))
     sleep $(( 300 - ( EPOCHSECONDS - premain_sec ) ))
     main
     maini=$((maini + 1))
     sleep $(( 300 - ( EPOCHSECONDS - premain_sec ) ))

diff --git a/pkgs b/pkgs
index c6ec1c868061987e16c16e86fcd9eb5b87944bdd..782b00f28640c04e6dc0e2ce865db7801be97472 100644 (file)
--- a/pkgs
+++ b/pkgs
@@ -151,6 +151,11 @@ p3=(
   expect
   # for ftp upload dejagnu test
   libdate-manip-perl libemail-messageid-perl
   expect
   # for ftp upload dejagnu test
   libdate-manip-perl libemail-messageid-perl

+  libdata-printer-perl
+  libautovivification-perl
+  libdata-types-perl
+  libdbd-pg-perl
+  libfile-libmagic-perl

   fakeroot
   fail2ban
   fdupes
   fakeroot
   fail2ban
   fdupes


@@ -186,6 +191,7 @@ p3=(
   gnome-screenshot
   # color picker
   gpick
   gnome-screenshot
   # color picker
   gpick

+  gron

   grepmail
   guvcview
   gwenview
   grepmail
   guvcview
   gwenview


@@ -217,6 +223,7 @@ p3=(
   knot-dnsutils
   libterm-readkey-perl
   libreoffice
   knot-dnsutils
   libterm-readkey-perl
   libreoffice

+  libreoffice-help-en-us

   linphone-desktop
   linux-doc
   lshw
   linphone-desktop
   linux-doc
   lshw

diff --git a/s256 b/s256
new file mode 100755 (executable)
index 0000000..0769059
--- /dev/null
+++ b/s256
@@ -0,0 +1,3 @@
+#!/usr/bin/perl
+use warnings FATAL => 'all';
+use 5.038;use Digest::SHA;print Digest::SHA->new(256)->addfile($ARGV[0], "b")->hexdigest;

diff --git a/sound-alert b/sound-alert
index 6bcfed0c39b89e9a5593eaa1fbc069b9291aec0e..7a43a905d19464f2128c6a5a821918a8482be6fb 100755 (executable)
--- a/sound-alert
+++ b/sound-alert
@@ -22,4 +22,4 @@
 
 set -e; . /usr/local/lib/bash-bear; set +e
 
 
 set -e; . /usr/local/lib/bash-bear; set +e
 

-mpv --speed=1 --no-terminal --vo=null --volume=90 /a/bin/data/d20.wav
+mpv --speed=1 --no-terminal --vo=null --volume=60 /a/bin/data/d20.wav

diff --git a/subdir_files/.config/mpv/scripts/iank-like1.lua b/subdir_files/.config/mpv/scripts/iank-like1.lua
deleted file mode 100644 (file)
index 83d5331..0000000
--- a/subdir_files/.config/mpv/scripts/iank-like1.lua
+++ /dev/null
@@ -1,16 +0,0 @@
--- mark for folder 4
-local like1_file = "/t/mpvlike1.log"
-mp.add_key_binding("v", "write_filename", function()
-    local filepath = mp.get_property("path")
-    -- Convert to absolute path if it's not already
-    if filepath and not filepath:match("^/") and not filepath:match("^%a:") then
-        local working_dir = mp.get_property("working-directory")
-        if working_dir then
-            filepath = working_dir .. "/" .. filepath
-        end
-
-        local file = io.open(like1_file, "a") -- Open the file in append mode
-        file:write(filepath .. "\n") -- Write the filename with a newline
-        file:close()
-    end
-end)

diff --git a/subdir_files/.config/mpv/scripts/iank-like2.lua b/subdir_files/.config/mpv/scripts/iank-like2.lua
deleted file mode 100644 (file)
index ba1160c..0000000
--- a/subdir_files/.config/mpv/scripts/iank-like2.lua
+++ /dev/null
@@ -1,16 +0,0 @@
--- mark for folder 3
-local like2_file = "/t/mpvlike2.log"
-mp.add_key_binding("x", "write_filename", function()
-    local filepath = mp.get_property("path")
-    -- Convert to absolute path if it's not already
-    if filepath and not filepath:match("^/") and not filepath:match("^%a:") then
-        local working_dir = mp.get_property("working-directory")
-        if working_dir then
-            filepath = working_dir .. "/" .. filepath
-        end
-
-        local file = io.open(like2_file, "a") -- Open the file in append mode
-        file:write(filepath .. "\n") -- Write the filename with a newline
-        file:close()
-    end
-end)

diff --git a/subdir_files/.config/mpv/scripts/iank-like3.lua b/subdir_files/.config/mpv/scripts/iank-like3.lua
deleted file mode 100644 (file)
index 7008d37..0000000
--- a/subdir_files/.config/mpv/scripts/iank-like3.lua
+++ /dev/null
@@ -1,16 +0,0 @@
--- mark for deletion
-local like3_file = "/t/mpvlike3.log"
-mp.add_key_binding("d", "write_filename", function()
-    local filepath = mp.get_property("path")
-    -- Convert to absolute path if it's not already
-    if filepath and not filepath:match("^/") and not filepath:match("^%a:") then
-        local working_dir = mp.get_property("working-directory")
-        if working_dir then
-            filepath = working_dir .. "/" .. filepath
-        end
-
-        local file = io.open(like3_file, "a") -- Open the file in append mode
-        file:write(filepath .. "\n") -- Write the filename with a newline
-        file:close()
-    end
-end)

diff --git a/system-status b/system-status
index 1558f0a4edb2e629bb979446a3e2722e7ef21ec7..70de43cec5f4460c93da0e4ef38e26bb5ca6010f 100755 (executable)
--- a/system-status
+++ b/system-status
@@ -288,6 +288,8 @@ write-status() {
   if ((qlen)); then
     # Do sending of long delayed messages, and dont count them in our queue warnings.
     for mid in $(exiqgrep -o 2400 -zi); do
   if ((qlen)); then
     # Do sending of long delayed messages, and dont count them in our queue warnings.
     for mid in $(exiqgrep -o 2400 -zi); do

+      # if we get annoying erors like this, we can redirect the awk sterr to null.
+      # awk: cmd. line:1: (FILENAME=- FNR=19) warning: Invalid multibyte data detected. There may be a mismatch between your data and your locale

       if exim -Mvh $mid | awk 'tolower($2) == "fdate:"' | grep -q .; then
         qlen=$(( qlen - 1 ))
         # shellcheck disable=SC2016 # exim var, not a bash bar
       if exim -Mvh $mid | awk 'tolower($2) == "fdate:"' | grep -q .; then
         qlen=$(( qlen - 1 ))
         # shellcheck disable=SC2016 # exim var, not a bash bar


@@ -335,12 +337,12 @@ write-status() {
   begin=false
 
   # todo: make this robust to the case of /a not being mounted
   begin=false
 
   # todo: make this robust to the case of /a not being mounted

-  if ! make -C /b/ds -q ~/.local/distro-begin 2>/dev/null || [[ $(<~/.local/distro-begin) != 0 ]]; then
+  if ! make --no-print-directory -C /b/ds -q ~/.local/distro-begin 2>/dev/null || [[ $(<~/.local/distro-begin) != 0 ]]; then

     begin=true
   fi
 
   end=false
     begin=true
   fi
 
   end=false

-  if ! make -C /b/ds -q ~/.local/distro-end 2>/dev/null || [[ $(<~/.local/distro-end) != 0 ]]; then
+  if ! make --no-print-directory -C /b/ds -q ~/.local/distro-end 2>/dev/null || [[ $(<~/.local/distro-end) != 0 ]]; then

     end=true
   fi
 
     end=true
   fi
 


@@ -462,6 +464,9 @@ write-status() {
 
 } # end write-status
 
 
 } # end write-status
 

+deactivated_sshd=false
+lock_check_fails=0
+

 # This prevents me having to mute notifications when I'm going to bed.
 mute() {
   local locked
 # This prevents me having to mute notifications when I'm going to bed.
 mute() {
   local locked