From e6fd4d2a9d0e937df2c2fd9708e39e43c984865c Mon Sep 17 00:00:00 2001
From: Ian Kelling <ian@iankelling.org>
Date: Mon, 11 Oct 2021 19:51:45 -0400
Subject: [PATCH] minor improvements

---
 brc2                                |  3 +-
 btrfsmaint                          | 18 +++++++-----
 check-stale-alerts                  |  2 +-
 distro-end                          | 45 ++++++++++++++++++++++++-----
 i3-sway/i3.conf                     |  2 +-
 mail-setup                          |  2 ++
 pkgs                                |  1 +
 subdir_files/.config/i3/config      |  2 +-
 subdir_files/.config/mpv/input.conf |  1 +
 subdir_files/sieve/lists.sieve      |  2 +-
 10 files changed, 56 insertions(+), 22 deletions(-)
 create mode 100644 subdir_files/.config/mpv/input.conf

diff --git a/brc2 b/brc2
index 070fb40..9dab446 100644
--- a/brc2
+++ b/brc2
@@ -1060,6 +1060,7 @@ mp() {
   done
 }
 
+# these might need a mu index or something added.
 mbenable() {
   local mb=$1
   dst=/m/4e/$mb
@@ -1067,7 +1068,6 @@ mbenable() {
   [[ -e $src ]] || { echo "src:$src does not exist"; return 1; }
   m mv -T $src $dst
   m ln -s -T $dst $src
-  mu index --maildir=/m/4e
 }
 mb2enable() {
   local mb
@@ -1082,7 +1082,6 @@ mb2enable() {
     m mv -T $src $dst
     m ln -sf -T $dst $link
   done
-  #mu index --maildir=/m/4e
 }
 mbdisable() {
   local mb=$1
diff --git a/btrfsmaint b/btrfsmaint
index c1e8d06..070b501 100755
--- a/btrfsmaint
+++ b/btrfsmaint
@@ -11,12 +11,13 @@ trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 # Man page says we could also use a range, i suppose it would be
 # logical to use a pattern like 5..10 10..20,
 # but I don't know if this would help us at all.
-dusage="1 5 10 20 30 40 50"
-musage="1 5 10 20 30"
+dusage="5 10"
+musage="5"
 
 e() { echo "cron: $*"; "$@"; }
 
 check-idle() {
+  type -p xprintidle &>/dev/null || return 0
   export DISPLAY=:0
   # a hours, a movie could run that long.
   idle_limit=$((1000 * 60 * 60 * 2))
@@ -104,16 +105,16 @@ main() {
     # e df -H $mnt
     if btrfs filesystem df $mnt | grep -q "Data+Metadata"; then
       for usage in $dusage; do
-        e btrfs balance start -dusage=$usage -musage=$usage $mnt
+        e ionice -c 3 btrfs balance start -dusage=$usage -musage=$usage $mnt
       done
     else
-      e btrfs balance start -dusage=0 $mnt
+      e ionice -c 3 btrfs balance start -dusage=0 $mnt
       for usage in $dusage; do
-        e btrfs balance start -dusage=$usage $mnt
+        e ionice -c 3 btrfs balance start -dusage=$usage $mnt
       done
-      e btrfs balance start -musage=0 $mnt
+      e ionice -c 3 btrfs balance start -musage=0 $mnt
       for usage in $musage; do
-        e btrfs balance start -musage=$usage $mnt
+        e ionice -c 3 btrfs balance start -musage=$usage $mnt
       done
     fi
     # e btrfs filesystem df $mnt
@@ -133,7 +134,8 @@ main() {
         continue
       fi
     fi
-    e btrfs scrub start -Bd $mnt
+    # -c 2 -n 4 is from btrfsmaintenance, does ionice
+    e btrfs scrub start -Bd -c 2 -n 4 $mnt
   done
 }
 
diff --git a/check-stale-alerts b/check-stale-alerts
index 1d8f70f..af7d4c7 100755
--- a/check-stale-alerts
+++ b/check-stale-alerts
@@ -12,7 +12,7 @@ if [[ $out ]]; then
   echo HOSTNAME: $HOSTNAME
   printf "%s\n" "$out"
 fi
-out=$(ssh bk.b8.nz find /m/md/bounces/new /var/local/cron-errors /home/iank/cron-errors /sysd-mail-once-state -type f -ctime +1v )
+out=$(ssh bk.b8.nz find /m/md/bounces/new /var/local/cron-errors /home/iank/cron-errors /sysd-mail-once-state -type f -ctime +1 )
 if [[ $out ]]; then
   echo bk.b8.nz:
   printf "%s\n" "$out"
diff --git a/distro-end b/distro-end
index db84160..3471fc2 100755
--- a/distro-end
+++ b/distro-end
@@ -338,9 +338,13 @@ EOF
   nabia|etiona)
     # for ziva
     #p install --no-install-recommends minetest/buster libleveldb1d/buster libncursesw6/buster libtinfo6/buster
-    f=/etc/apt/sources.list.d/buster.list
-    t=$(mktemp)
-    cat >$t <<EOF
+    doupdate=false
+    for n in buster bullseye; do
+      f=/etc/apt/sources.list.d/$n.list
+      t=$(mktemp)
+      case $n in
+        buster)
+          cat >$t <<'EOF'
 deb http://http.us.debian.org/debian buster main
 deb-src http://http.us.debian.org/debian buster main
 
@@ -353,17 +357,42 @@ deb-src http://http.us.debian.org/debian buster-updates main
 deb http://http.debian.net/debian buster-backports main
 deb-src http://http.debian.net/debian buster-backports main
 EOF
-    if ! diff -q $t $f; then
+          ;;
+        bullseye)
+          cat >$t <<'EOF'
+EOF
+          cat >$t <<EOF
+deb http://deb.debian.org/debian bullseye main
+deb-src http://deb.debian.org/debian bullseye main
+
+deb http://deb.debian.org/debian-security/ bullseye-security main
+deb-src http://deb.debian.org/debian-security/ bullseye-security main
+
+deb http://deb.debian.org/debian bullseye-updates main
+deb-src http://deb.debian.org/debian bullseye-updates main
+
+deb http://http.debian.net/debian bullseye-backports main
+deb-src http://http.debian.net/debian bullseye-backports main
+EOF
+          ;;
+      esac
+
+      if ! diff -q $t $f; then
+        doupdate=true
+        s cp $t $f
+        s chmod 644 $f
+      fi
+    done
+    if $doupdate; then
       curl -s https://ftp-master.debian.org/keys/archive-key-10-security.asc | sudo apt-key add -
       curl -s https://ftp-master.debian.org/keys/archive-key-10.asc | sudo apt-key add -
-      s cp $t $f
-      s chmod 644 $f
       p update
     fi
-    if [[ ! -e /usr/share/debootstrap/scripts/buster ]]; then
+
+    if [[ ! -e /usr/share/debootstrap/scripts/bullseye ]]; then
       t=$(mktemp -d)
       cd $t
-      m aptitude download debootstrap/buster
+      m aptitude download debootstrap/bullseye
       m ex ./*
       sudo cp ./usr/share/debootstrap/scripts/* /usr/share/debootstrap/scripts
     fi
diff --git a/i3-sway/i3.conf b/i3-sway/i3.conf
index 45a7c92..7b9dff3 100644
--- a/i3-sway/i3.conf
+++ b/i3-sway/i3.conf
@@ -1,5 +1,5 @@
 # exit i3 (logs you out of your X session)
-bindsym $mod+Shift+Tilde exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'"
+bindsym $mod+Shift+o exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'"
 
 bindsym $mod+Shift+p restart
 
diff --git a/mail-setup b/mail-setup
index 7aa74e7..57d5753 100755
--- a/mail-setup
+++ b/mail-setup
@@ -1873,6 +1873,8 @@ EOF
 fi
 EOFOUTER
 
+    mkdir -p /var/www/cron-errors
+    chown www-data.www-data /var/www/cron-errors
     i /etc/cron.d/$ncbase <<EOF
 PATH=/sbin:/usr/sbin:/usr/bin:/bin:/usr/local/bin
 SHELL=/bin/bash
diff --git a/pkgs b/pkgs
index 20bc082..95bf287 100644
--- a/pkgs
+++ b/pkgs
@@ -86,6 +86,7 @@ p3=(
   copyq
   cpulimit
   cron
+  cvs
   debian-archive-keyring
   debug-me
   debootstrap
diff --git a/subdir_files/.config/i3/config b/subdir_files/.config/i3/config
index 0178368..759310f 100644
--- a/subdir_files/.config/i3/config
+++ b/subdir_files/.config/i3/config
@@ -106,7 +106,7 @@ bindsym $mod+End exec /a/opt/clipster/clipster -sp
 # file:///usr/share/doc/i3-wm/userguide.html#_border_style_for_new_windows
 new_window none
 # exit i3 (logs you out of your X session)
-bindsym $mod+Shift+Tilde exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'"
+bindsym $mod+Shift+o exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'"
 
 bindsym $mod+Shift+p restart
 
diff --git a/subdir_files/.config/mpv/input.conf b/subdir_files/.config/mpv/input.conf
new file mode 100644
index 0000000..fc26303
--- /dev/null
+++ b/subdir_files/.config/mpv/input.conf
@@ -0,0 +1 @@
+a cycle_values video-rotate "90" "180" "270" "0"
diff --git a/subdir_files/sieve/lists.sieve b/subdir_files/sieve/lists.sieve
index 0e44307..1d1be20 100644
--- a/subdir_files/sieve/lists.sieve
+++ b/subdir_files/sieve/lists.sieve
@@ -67,7 +67,7 @@ if anyof (
   header :contains "list-id" "<xapian-devel.lists.xapian.org>",
   header :contains "list-id" "<kdeconnect.kde.org>",
   header :contains "list-id" "<mu-discuss.googlegroups.com>",
-  header :contains "list-id" "<<devel.mediagoblin.org>",
+  header :contains "list-id" "<devel.mediagoblin.org>",
   header :contains "list-id" "<maru-os.googlegroups.com>",
   header :contains "list-id" "<listhelper-moderate.nongnu.org>",
   header :contains "list-id" "<coreboot.coreboot.org>",
-- 
2.30.2