minor tweaks

diff --git a/brc b/brc
index 96e66a883d647c5e69538b53e96b704814f1f14a..a4c0589d5c627920c30fe6869c1e71e70e9d57f4 100644 (file)
--- a/brc
+++ b/brc
@@ -152,7 +152,7 @@ HISTCONTROL=ignoredups
 # works in addition to HISTCONTROL to do more flexible things
 # it could also do the same things as HISTCONTROL and thus replace it,
 # but meh. dunno why, but just " *" does glob expansion, so use [ ] to avoid it.
-HISTIGNORE='k *:[ ]*'
+HISTIGNORE='pass *:k *:[ ]*'
 
 export BC_LINE_LENGTH=0
 
@@ -568,9 +568,11 @@ fastboot() {
     /a/opt/android-platform-tools/fastboot "$@";
 }
 
+kdecd() { /usr/lib/x86_64-linux-gnu/libexec/kdeconnectd; }
 
 # List of apps to install/update
 # Create from existing manually installed apps by doing
+# fdroidcl update
 # fdroidcl search -i, then manually removing
 # automatically installed/preinstalled apps
 
@@ -589,8 +591,8 @@ fastboot() {
 # usually good enough to just rm -rf /data/app/APPNAME
 #
 # currently broken:
-#at.bitfire.davdroid
 fdroid_pkgs=(
+    at.bitfire.davdroid
     com.alaskalinuxuser.justnotes
     com.artifex.mupdfdemo
     com.fsck.k9
@@ -615,6 +617,7 @@ fdroid_pkgs=(
     org.quantumbadger.redreader
     org.smssecure.smssecure
     org.fedorahosted.freeotp
+    org.yaaic
 )
 # https://forum.xda-developers.com/android/software-hacking/wip-selinux-capable-superuser-t3216394
 # for maru,
@@ -974,7 +977,7 @@ jtail() {
 }
 
 kff() { # keyboardio firmware flash
-    pushd /a/opt/sketches/Model01-Firmware
+    pushd /a/bin/distro-setup/Arduino/Model01-Firmware
     yes $'\n' | make flash
     popd
 }
@@ -1631,10 +1634,10 @@ m() { printf "%s\n" "$*";  "$@"; }
 
 
 vpncmd() {
-    m s nsenter -t $(pgrep -f "/usr/sbin/openvpn .* --config /etc/openvpn/client/client.conf") -n -m "$@"
+    m s nsenter -t $(pgrep -f "/usr/sbin/openvpn .* --config /etc/openvpn/.*client.conf") -n -m "$@"
 }
 vpnf() {
-    vpncmd gksudo -u ian "firefox -no-remote -P firefox-main-profile" &r
+    vpncmd gksudo -u iank "firefox -no-remote -P firefox-main-profile" &r
 }
 vpnbash() {
     vpncmd bash

diff --git a/disabled/bitcoin b/disabled/bitcoin
index 96239ca8138bd1cd2314c9cef82e7ce50a57d5de..9142e2b3c99239ecdc1f1c056965880db1bbfd34 100644 (file)
--- a/disabled/bitcoin
+++ b/disabled/bitcoin
@@ -43,11 +43,11 @@ if [[ $HOSTNAME == frodo ]]; then
 
                     f=$dir/bitcoin.conf
                     s dd of=$f <<EOF
-    server=1
-    # necessary for joinmarket, not bad in general
-    rpcpassword=$(openssl rand -base64 32)
-    rpcuser=$(openssl rand -base64 32)
-    EOF
+server=1
+# necessary for joinmarket, not bad in general
+rpcpassword=$(openssl rand -base64 32)
+rpcuser=$(openssl rand -base64 32)
+EOF
 
                     # dunno about sharing a wallet between multiple instances
                     # manually did, wallet.dat symlinked in /nocow/.bitcoin
@@ -68,11 +68,11 @@ if [[ $HOSTNAME == frodo ]]; then
                 f2=$dir/bitcoinjm.conf
                 s cp $f $f2
                 s tee -a $f2 >/dev/null <<EOF
-    # Joinmarket
-    walletnotify=curl -sI --connect-timeout 1 http://localhost:62602/walletnotify?%s
-    alertnotify=curl -sI --connect-timeout 1 http://localhost:62602/alertnotify?%s
-    wallet=joinmarket.dat
-    EOF
+# Joinmarket
+walletnotify=curl -sI --connect-timeout 1 http://localhost:62602/walletnotify?%s
+alertnotify=curl -sI --connect-timeout 1 http://localhost:62602/alertnotify?%s
+wallet=joinmarket.dat
+EOF
 
                 ;;
             # other distros unknown

diff --git a/fsf-get-mail b/fsf-get-mail
index f2288947553b373ade2ff9c552aa21a99bcfdcbc..ee7caee28ee1f00524569f1f346bb1a287c78c59 100755 (executable)
--- a/fsf-get-mail
+++ b/fsf-get-mail
@@ -1,6 +1,10 @@
 #!/bin/bash
-offlineimap -a fsf
-sieve-filter -eW -o mail_location=maildir:/nocow/user/fsfmd:LAYOUT=fs:INBOX=/nocow/user/fsfmd/INBOX ~/sieve/fsf.sieve INBOX &>/tmp/fsfsieve.log
+
+# commented, because relying on cronjob
+#offlineimap -a fsf
+
+# delete based on http://deflexion.com/2006/05/imap-way-of-deleting-message
+sieve-filter -eW -o mail_location=maildir:/nocow/user/fsfmd:LAYOUT=fs:INBOX=/nocow/user/fsfmd/INBOX ~/sieve/fsf.sieve INBOX delete &>/tmp/fsfsieve.log
 
 
 # to test new rules, update fsf-test.sieve, run these commands, then copy new fsf-test.sieve to fsf.sieve

diff --git a/mail-setup b/mail-setup
index b02da1ea52efaec1099e71c47d903269f47b815e..5ad953ad3af37b540aea2e2e626a70473c1e3fb0 100755 (executable)
--- a/mail-setup
+++ b/mail-setup
@@ -317,10 +317,10 @@ EOF
 
     cat >/etc/systemd/system/offlineimapsync.timer <<'EOF'
 [Unit]
-Description=Run offlineimap-sync once every 5 mins
+Description=Run offlineimap-sync once every min
 
 [Timer]
-OnCalendar=*:0/5
+OnCalendar=*:0/1
 
 [Install]
 WantedBy=timers.target

diff --git a/pkgs b/pkgs
index 40894720922645ce7d0568cde7deefc642b9f399..72ea16196320d6d3413d2c40bb54abee07d95a9b 100644 (file)
--- a/pkgs
+++ b/pkgs
@@ -43,6 +43,7 @@ p3=(
 # xawtv has webcam cli control. v4lctl bright 80%; v4lctl list
 # guvcview also adjusts webcam
 # pv is used by btrbk
+# libterm-readkey-perl for rt cli tool
 p4=(
     adb
     apache2
@@ -94,6 +95,7 @@ p4=(
     kid3-qt
     kid3-cli
     konsole
+    libterm-readkey-perl
     libreoffice
     linphone
     linux-doc
@@ -128,6 +130,7 @@ p4=(
     python3-doc
     qrencode
     reportbug
+    rng-tools
     sakura
     schroot
     sqlite3-doc

diff --git a/radicale-setup b/radicale-setup
index 929a14fc27caabd205da810f80bfff259bf48dfa..531f1ecd6f995ab2e3277b256dca752d12bc905c 100755 (executable)
--- a/radicale-setup
+++ b/radicale-setup
@@ -34,7 +34,7 @@ BindsTo=$vpn_ser@mail.service
 After=$vpn_ser@mail.service
 
 [Install]
-RequiredBy=openvpn-client@mail.service
+RequiredBy=$vpn_ser@mail.service
 EOF
 ser daemon-reload # not sure this is needed
 

diff --git a/subdir_files/.gnupg/gpg.conf b/subdir_files/.gnupg/gpg.conf
index 3ddb9ff196f5ce82e0ec2e8f183f3adfe863a89d..f45b4ee6cea240fcf9d3668578d1bf5db53d9ba7 100644 (file)
--- a/subdir_files/.gnupg/gpg.conf
+++ b/subdir_files/.gnupg/gpg.conf
@@ -13,9 +13,10 @@ use-agent
 # another option is 0xshort
 keyid-format 0xlong
 
-# iank@fsf.org
 default-key B125F60B7B287FF6A2B7DF8F170AF0E2954295DF
 
+default-key 0xFB40960C541A7D1F
+
 # note, i did this so that gpg-agent would not hold open the .gnupg dir.
 # so I could unmount the filesystem which holds the .gnupg dir while
 # running gpg-agent.

diff --git a/subdir_files/sieve/fsf.sieve b/subdir_files/sieve/fsf.sieve
index 9c631afc9d3a62ec2355749471b6fa45deff1b9c..a66152394005a473f2c0f407a08a7ed4eefb3179 100644 (file)
--- a/subdir_files/sieve/fsf.sieve
+++ b/subdir_files/sieve/fsf.sieve
@@ -1,5 +1,10 @@
 require [ "regex", "variables", "fileinto", "envelope", "mailbox", "imap4flags", "include" ];
 
+if anyof (header :contains "list-id" "<office-commits.gnu.org>") {
+    discard;
+    stop;
+         }
+
 if anyof (
     address :is "from" "sysadmin@gnu.org",
     address :is "to" "sysadmin-nonrt@gnu.org",
@@ -9,13 +14,14 @@ if anyof (
     stop;
          }
 elsif anyof (
-    header :contains "list-id" "<office-commits.gnu.org>",
     header :is "Return-path" "<rtbounces@gnu.org>"
     ) {
 fileinto :create "rtcc";
     stop;
 }
 
+
+
 if anyof (
     header :regex "subject" "mailing list memberships reminder",
     address :is "to" "rtbounces@gnu.org",

diff --git a/subdir_files/sieve/lists.sieve b/subdir_files/sieve/lists.sieve
index 6dbafa276c5d267f383c98d98175dcfe754aafa9..f64aafb9ff463d6b35ea6660a2372c4479a3b0ba 100644 (file)
--- a/subdir_files/sieve/lists.sieve
+++ b/subdir_files/sieve/lists.sieve
@@ -50,6 +50,7 @@ if anyof (
     header :contains "list-id" "<qemu-devel.nongnu.org>",
     header :contains "list-id" "<exim-dev.exim.org>",
     header :contains "list-id" "<exim-users.exim.org>",
+    header :contains "list-id" "<octave-maintainers.gnu.org>",
     header :contains "list-id" "<xmonad.haskell.org>") {
     if header :regex "list-id" "<([a-z_0-9-]+)[.@]" {
         set :lower "listname" "${1}";