X-Git-Url: https://iankelling.org/git/?p=distro-setup;a=blobdiff_plain;f=distro-end;h=317852291a0d21fb83764c2d7225f0c5a0f5dd66;hp=3b109c80d30d423bb2526b9fe1e081f560803bdc;hb=79b274fcd8bfa556133ab13270e84b40aebe8468;hpb=f5c8ee56b55b90298b48c83ed0f7ec98cce96bb5

diff --git a/distro-end b/distro-end
index 3b109c8..3178522 100755
--- a/distro-end
+++ b/distro-end
@@ -1,368 +1,463 @@
 #!/bin/bash -l
-# Copyright (C) 2016 Ian Kelling
+# Copyright (C) 2019 Ian Kelling
+# SPDX-License-Identifier: AGPL-3.0-or-later
 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+### setup
+source /a/bin/errhandle/err
+src="$(readlink -f -- "${BASH_SOURCE[0]}")"; src=${src%/*} # directory of this file
 
-#     http://www.apache.org/licenses/LICENSE-2.0
-
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+if [[ $EUID == 0 ]]; then
+  echo "$0: error: run as regular user" >&2
+  exit 1
+fi
 
-errcatch
+_errcatch_cleanup() {
+  echo 1 >~/.local/distro-end
+}
 
-set -x
+# shellcheck source=./pkgs
+source $src/pkgs
 
 exec &> >(sudo tee -a /var/log/distro-end)
 echo "$0: $(date): starting now)"
-
-src="${BASH_SOURCE%/*}"
-
 # see example of usage to understand.
 end_msg() {
-    local y
-    IFS= read -r -d '' y  ||:
-    end_msg_var+="$y"
+  local y
+  IFS= read -r -d '' y  ||:
+  end_msg_var+="$y"
 }
-
-spa() { # simple package add
-    simple_packages+=($@)
+end() {
+  e "$end_msg_var"
+  echo 0 >~/.local/distro-end
+  if $pending_reboot; then
+    echo "$0: pending reboot and then finished. doing it now."
+    s reboot now
+  else
+    echo "$0: $(date): ending now)"
+  fi
+  exit 0
 }
-
+pre="${0##*/}:"
+s() {
+  printf "s %s\n" "$*"
+  SUDOD="$PWD" sudo -i "$@";
+}
+sd() {
+  s dd of="$1" 2>/dev/null
+}
+m() { printf "$pre %s\n"  "$*"; "$@"; }
+e() { printf "$pre %s\n"  "$*"; }
+err() { echo "[$(date +'%Y-%m-%d %H:%M:%S%z')]: $0: $*" >&2; }
 distro=$(distro-name)
-
+codename=$(debian-codename)
+codename_compat=$(debian-codename-compat)
 pending_reboot=false
 sed="sed --follow-symlinks"
-
 # template
 case $distro in
 esac
 
+#### initial packages
 pup
-pi aptitude
-
-simple_packages=(
-    htop
-    iptables
-    mailutils
-    nmon
-    rdiff-backup
-    ruby
-    ruby-rest-client
-    tree
-    vim
-    wcd
-    wget
-)
+if isdeb; then
+  pi aptitude
+fi
 
-case $HOSTNAME in
-    lj|li) : ;;
-    *)
-        # universal packages
-        # swh-plugins is for karaoke pulsaudio filter.
-        # mutagen for pithos
-        # guvcview set webcam brightness to highest
-        # pidgin-otr, i went into pidgin pluggin settings and generated a key for some accounts
-        simple_packages+=(
-            apache2
-            apache2-doc
-            apt-doc
-            apt-listchanges
-            aptitude-doc-en
-            bash-doc
-            beets
-            beets-doc
-            binutils-doc
-            bind9-doc
-            bind9utils
-            bwm-ng
-            cloc
-            cpulimit
-            cron
-            debconf-doc
-            dirmngr
-            dnsutils
-            dnsmasq
-            dtrx
-            duplicity
-            eclipse
-            evince
-            fdupes
-            feh
-            filelight
-            flashrom
-            gawk-doc
-            gcc-doc
-            gdb
-            gdb-doc
-            geoip-bin
-            git-doc
-            git-email
-            gitk
-            glibc-doc
-            goaccess
-            gnome-screenshot
-            guvcview
-            i3lock
-            inetutils-traceroute
-            iperf3
-            iproute2-doc
-            jq
-            kid3-qt
-            kid3-cli
-            linux-doc
-            locate
-            lshw
-            make-doc
-            manpages
-            manpages-dev
-            mb2md
-            meld
-            mps-youtube
-            mumble
-            nagstamon
-            ncdu
-            nginx-doc
-            nmap
-            offlineimap
-            oathtool
-            opendkim-tools
-            p7zip
-            paprefs
-            parted-doc
-            pavucontrol
-            pdfgrep
-            perl-doc
-            pianobar
-            pidgin
-            pidgin-otr
-            pry
-            python-autopep8
-            python3-doc
-            python3-mutagen
-            qrencode
-            reportbug
-            $(aptitude show ruby | sed -rn 's/Depends: (.*)/\1/p')-doc
-            sqlite3-doc
-            squashfs-tools
-            swh-plugins
-            tar-doc
-            tcpdump
-            telnet
-            transmission-remote-gtk
-            vlc
-            whois
-            wondershaper
-        )
-        spa $(apt-cache search ruby[.0-9]+-doc| awk '{print $1}')
-        ;;
-esac
+# avoid prompts
+s debconf-set-selections <<EOF
+popularity-contest popularity-contest/participate boolean true
+EOF
 
+########### begin section including linode ################
+pi ${p2[@]}
 
-########### begin section including li ################
 
 conflink
 
+# no equivalent in other distros:
+if isdeb && pcheck apt-file; then
+  # this condition is just a speed optimization
+  pi apt-file
+  s apt-file update
+fi
+
+
+# disable motd junk.
 case $distro in
-    arch)
-        # ubuntu 14.04 uses b-cron,
-        # but its not maintained in arch.
-        # of the ones in the main repos, cronie is only one maintained.
-        # fcron appears abandoned software.
-        pi cronie
-        sgo cronie
-        ;;
-    *) : ;; # other distros come with cron.
+  debian)
+    # allows me to pipe with ssh -t, and gets rid of spam
+    # http://forums.debian.net/viewtopic.php?f=5&t=85822
+    # i'd rather disable the service than comment the init file
+    # this says disabling the service, it will still get restarted
+    # but this script doesn't do anything on restart, so it should be fine
+    s truncate -s0 /var/run/motd.dynamic
+    ;;
+  trisquel|ubuntu)
+    # this isn't a complete solution. It still shows me when updates are available,
+    # but it's no big deal.
+    s rm -fv /etc/update-motd.d/10-help-text /etc/update-motd.d/00-header
+    ;;
 esac
 
 
 
-case $distro in
-    *) pi at ;;&
-    arch) sgo atd ;;
-esac
 
+### begin certbot install ###
+if [[ $distro == debian ]]; then
+  # note, need python-certbot-nginx for nginx, but it depends on nginx,
+  # and I'm not installing nginx by default right now.
+  pi certbot python-certbot-apache
+elif [[ $codename_compat == xenial ]]; then
+  # not packaged in xenial or flidas
+  pi software-properties-common
+  l="deb http://ppa.launchpad.net/certbot/certbot/ubuntu xenial main"
+  if ! grep -xFq "$l" /etc/apt/sources.list{,.d/*.list}; then
+    s add-apt-repository -y ppa:certbot/certbot ||:
+    m p update
+  fi
+  pi python-certbot-apache
+else
+  err "distro unknown for certbot"
+fi
+# make a version of the certbot timer that emails me.
+x=/systemd/system/certbot
+$sed -r -f - /lib$x.timer <<'EOF' |sd /etc${x}mail.timer
+s,^Description.*,\0 mail version,
+EOF
+$sed -r -f - /lib$x.service <<'EOF' |sd /etc${x}mail.service
+s,(ExecStart=)(/usr/bin/certbot),\1/a/bin/log-quiet/sysd-mail-once certbotmail \2 --renew-hook /a/bin/distro-setup/certbot-renew-hook,
+EOF
+ser daemon-reload
+m sgo certbotmail.timer
+### end certbot install ###
+
+
+# dogcam setup. not using atm
+# case $HOSTNAME in
+#   lj|li)
+#     /a/bin/webcam/install-server
+#     ;;
+#   kw)
+#     /a/bin/webcam/install-client
+#     ;;
+# esac
 
-case $distro in
-    debian|trisquel|ubuntu) pi curl;;
-    arch) : ;;
-    # fedora: unknown
-esac
 
-case $distro in
-    # tk for gitk
-    arch) spa git tk ;;
-    *) spa git ;;
-esac
+## not actually using prometheus just yet
+# # office is not exposed to internet yet
+# if [[ $HOSTNAME != kw ]]; then
+#   ## prometheus node exporter setup
+#   web-conf -f 9100 -p 9101 apache2 $(hostname -f) <<'EOF'
+# #https://httpd.apache.org/docs/2.4/mod/mod_authn_core.html#authtype
+# # https://stackoverflow.com/questions/5011102/apache-reverse-proxy-with-basic-authentication
+# <Location />
+#    AllowOverride None
+#    AuthType basic
+#    AuthName "Authentication Required"
+#    # setup one time, with root:www-data, 640
+#    AuthUserFile "/etc/prometheus-htpasswd"
+#    Require valid-user
+# </Location>
+# EOF
+# fi
 
-case $distro in
-    arch) spa the_silver_searcher ;;
-    debian|trisquel|ubuntu) spa silversearcher-ag ;;
-    # fedora unknown
-esac
 
-case $distro in
-    debian|trisquel|ubuntu) spa ntp;;
-    arch)
-        pi ntp
-        sgo ntpd
-        ;;
-    # others unknown
-esac
+######### begin flidas pinned packages ######
+case $(debian-codename) in
+  # needed for debootstrap scripts for fai since fai requires debian
+  flidas)
+    curl http://archive.ubuntu.com/ubuntu/project/ubuntu-archive-keyring.gpg | s apt-key add -
+    sd /etc/apt/preferences.d/flidas-xenial <<EOF
+Package: *
+Pin: release a=xenial
+Pin-Priority: -100
 
+Package: *
+Pin: release a=xenial-updates
+Pin-Priority: -100
 
-# no equivalent in other distros:
-case $distro in
-    debian|trisquel|ubuntu)
-        pi aptitude
-        if ! dpkg -s apt-file &>/dev/null; then
-            # this condition is just a speed optimization
-            pi apt-file
-            s apt-file update
-        fi
-        # for debconf-get-selections
-        spa debconf-utils
-        ;;
-esac
+Package: *
+Pin: release a=xenial-security
+Pin-Priority: -100
+EOF
+    sd /etc/apt/sources.list.d/xenial.list 2>/dev/null <<EOF
+deb http://us.archive.ubuntu.com/ubuntu/ xenial main
+deb http://us.archive.ubuntu.com/ubuntu/ xenial-updates main
+deb http://us.archive.ubuntu.com/ubuntu/ xenial-security main
+EOF
 
+    if ! apt-key list | grep /C0B21F32 &>/dev/null; then
+      s apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 3B4FE6ACC0B21F32
+      sd /etc/apt/preferences.d/flidas-bionic <<EOF
+Package: *
+Pin: release a=bionic
+Pin-Priority: -100
 
-case $distro in
-    arch|debian|trisquel|ubuntu)
-        spa bash-completion
-        ;;
-    # others unknown
-esac
+Package: *
+Pin: release a=bionic-updates
+Pin-Priority: -100
 
+Package: *
+Pin: release a=bionic-security
+Pin-Priority: -100
+EOF
+    fi
 
+    # better to run btrfs-progs which matches our kernel version
+    # (note, renamed from btrfs-tools)
+    sd /etc/apt/preferences.d/btrfs-progs <<EOF
+Package: btrfs-progs libzstd1
+Pin: release a=bionic
+Pin-Priority: 1005
 
+Package: btrfs-progs libzstd1
+Pin: release a=bionic-updates
+Pin-Priority: 1005
 
+Package: btrfs-progs libzstd1
+Pin: release a=bionic-security
+Pin-Priority: 1005
+EOF
 
-# disable motd junk.
-case $distro in
-    debian)
-        # allows me to pipe with ssh -t, and gets rid of spam
-        # http://forums.debian.net/viewtopic.php?f=5&t=85822
-        # i'd rather disable the service than comment the init file
-        # this says disabling the service, it will still get restarted
-        # but this script doesn't do anything on restart, so it should be fine
-        s dd of=/var/run/motd.dynamic if=/dev/null
-        # stretch doesn't have initscripts pkg installed by default
-        if [[ $(debian-codename) == jessie ]]; then
-            s update-rc.d motd disable
-        fi
-        ;;
-    trisquel|ubuntu)
-        # this isn't a complete solution. It still shows me when updates are available,
-        # but it's no big deal.
-        s t /etc/update-motd.d/10-help-text /etc/update-motd.d/00-header
-        ;;
-esac
 
-# automatic updates
-# reference:
-# https://debian-handbook.info/browse/stable/sect.regular-upgrades.html
-# /etc/cron.daily/apt calls unattended-upgrades
-# /usr/share/doc/unattended-upgrades# cat README.md
-# /etc/apt/apt.conf.d/50unattended-upgrades
-if isdebian; then
-    setup-debian-auto-update
-fi
+    t=$(mktemp)
+    cat >$t <<EOF
+deb http://us.archive.ubuntu.com/ubuntu/ bionic main
+deb http://us.archive.ubuntu.com/ubuntu/ bionic-updates main
+deb http://us.archive.ubuntu.com/ubuntu/ bionic-security main
+EOF
+    f=/etc/apt/sources.list.d/bionic.list
+    if ! diff -q $t $f; then
+      s cp $t $f
+      s chmod 644 $f
+      m p update
+    fi
 
-# we've got a few dependencies later on, so install them now.
-pi eatmydata; PI_PREFIX=eatmydata
-pi "${simple_packages[@]}"
-simple_packages=()
+    # no special reason, but its better for btrfs-progs to
+    # be closer to our kernel version
+    pi btrfs-progs
 
+    if [[ ! -e /usr/share/debootstrap/scripts/xenial ]]; then
+      t=$(mktemp -d)
+      cd $t
+      m aptitude download debootstrap/xenial
+      m ex ./*
+      s cp ./usr/share/debootstrap/scripts/* /usr/share/debootstrap/scripts
+    fi
 
-### begin docker install ####
+    sd /etc/apt/preferences.d/flidas-etiona <<EOF
+Package: *
+Pin: release a=etiona
+Pin-Priority: -100
 
-if isdeb; then
-    # https://store.docker.com/editions/community/docker-ce-server-debian?tab=description
-    pi  software-properties-common apt-transport-https
-    curl -fsSL https://download.docker.com/linux/$(distro-name-compat)/gpg | sudo apt-key add -
-    sudo add-apt-repository \
-         "deb [arch=amd64] https://download.docker.com/linux/$(distro-name-compat) \
-         $(debian-codename-compat) \
-         stable"
-    p update
-    pi docker-ce
-    sgo docker
-    # other distros unknown
-fi
-###  end docker install ####
+Package: *
+Pin: release a=etiona-updates
+Pin-Priority: -100
 
+Package: *
+Pin: release a=etiona-security
+Pin-Priority: -100
 
-case $distro in
-    debian)
-        # note, need python-certbot-nginx for nginx, but it depends on nginx,
-        # and I'm not installing nginx by default right now.
-        # note python-certbot-apache is in suggests, but so is a doc package that brought in xorg
-        if [[ $(debian-codename) == jessie ]]; then
-            pi -t jessie-backports certbot python-certbot-apache
-        else
-            pi certbot python-certbot-apache
-        fi
-        # make a version of the certbot timer that emails me.
-        x=/systemd/system/certbot
-        $sed -r -f - /lib$x.timer <<'EOF' |s dd of=/etc${x}mail.timer
-s,^Description.*,\0 mail version,
+Package: *
+Pin: release a=etiona-backports
+Pin-Priority: -100
 EOF
-        $sed -r -f - /lib$x.service <<'EOF' |s dd of=/etc${x}mail.service
-s,(ExecStart=)(/usr/bin/certbot),\1/a/bin/log-quiet/sysd-mail-once certbotmail \2 --renew-hook /a/bin/distro-setup/certbot-renew-hook,
+
+    t=$(mktemp)
+    cat >$t <<EOF
+deb http://mirror.fsf.org/trisquel/ etiona main
+deb http://mirror.fsf.org/trisquel/ etiona-updates main
+deb http://archive.trisquel.info/trisquel/ etiona-security main
+deb http://mirror.fsf.org/trisquel/ etiona-backports main
+EOF
+    f=/etc/apt/sources.list.d/etiona.list
+    if ! diff -q $t $f; then
+      s cp $t $f
+      n s chmod 644 $f
+      m p update
+    fi
+
+    sd /etc/apt/preferences.d/debian-goodies <<EOF
+Package: debian-goodies
+Pin: release n=etiona
+Pin-Priority: 1005
+EOF
+
+
+    sd /etc/apt/preferences.d/flidas-buster <<EOF
+Package: *
+Pin: release n=buster
+Pin-Priority: -100
+
+Package: *
+Pin: release n=buster-updates
+Pin-Priority: -100
 EOF
-        ser daemon-reload
-        sgo certbotmail.timer
-
-        ;;
-    trisquel|ubuntu)
-        # not packaged in xenial or flidas
-        pi software-properties-common
-        s add-apt-repository -y ppa:certbot/certbot
-        p update
-        pi python-certbot-apache
-        ;;
-    # todo: other distros unknown
+
+    # dont use buster because it causes dist-upgrade to think its downgrading
+    # packages while really just reinstalling the same version.
+    f=/etc/apt/apt.conf.d/01iank
+    s rm -fv $f
+    #         # stupid buster uses some key algorithm not supported by flidas gpg that apt uses.
+    #         sd /etc/apt/apt.conf.d/01iank <<'EOF'
+    # Acquire::AllowInsecureRepositories "true";
+    # EOF
+
+    f=/etc/apt/sources.list.d/buster.list
+    s rm -fv $f
+    #         t=$(mktemp)
+    #         cat >$t <<EOF
+    # deb http://http.us.debian.org/debian buster main
+    # deb-src http://http.us.debian.org/debian buster main
+
+    # deb http://security.debian.org/ buster/updates main
+    # deb-src http://security.debian.org/ buster/updates main
+
+    # deb http://http.us.debian.org/debian buster-updates main
+    # deb-src http://http.us.debian.org/debian buster-updates main
+    # EOF
+    #         if ! diff -q $t $f; then
+    #           s cp $t $f
+    #           s chmod 644 $f
+    #           p update
+    #         fi
+
+    # newer version needed for false positive in checkrestart.
+    # I did buster at first, but other problem above with having
+    # buster repos. not sure if the false positive exists in etiona.
+    pi debian-goodies
+
+    sd /etc/apt/preferences.d/shellcheck <<EOF
+Package: shellcheck
+Pin: release a=etiona
+Pin-Priority: 1005
+
+Package: shellcheck
+Pin: release a=etiona-updates
+Pin-Priority: 1005
+
+Package: shellcheck
+Pin: release a=etiona-security
+Pin-Priority: 1005
+EOF
+
+    sd /etc/apt/preferences.d/bash <<EOF
+Package: bash
+Pin: release a=etiona
+Pin-Priority: 1005
+
+Package: bash
+Pin: release a=etiona-updates
+Pin-Priority: 1005
+
+Package: bash
+Pin: release a=etiona-security
+Pin-Priority: 1005
+EOF
+
+
+    ;;
+  *)
+    if isdeb; then
+      pi debian-goodies shellcheck
+    fi
+    ;;
 esac
+######### end flidas pinned packages ######
+
+##### begin automatic upgrades (after checkrestart has been installed) ####
+sd /etc/apt/apt.conf.d/10periodic <<'EOF'
+# this file was mostly just comments.
+APT::Periodic::Update-Package-Lists "1";
+APT::Periodic::Download-Upgradeable-Packages "1";
+APT::Periodic::AutocleanInterval "7";
+APT::Periodic::Unattended-Upgrade "1";
+EOF
+
+sd /etc/apt/apt.conf.d/50unattended-upgrades  <<EOF
+# fyi: default file has comments about available options,
+# you may want to read that, do pkx unattended-upgrades
+Unattended-Upgrade::Mail "root";
+Unattended-Upgrade::MailOnlyOnError "true";
+Unattended-Upgrade::Remove-Unused-Dependencies "true";
+Unattended-Upgrade::Origins-Pattern {
+  # default is just security updates. this list found from reading
+  # match_whitelist_string() in `which unattended-upgrades`
+  "o=*,l=*,a=*,c=*,site=*,n=*";
+};
+EOF
+
+# old names, too verbose
+s rm -f /etc/cron.d/unattended-upgrade-reboot /usr/local/bin/zelous-unattended-reboot
+
+sd /etc/cron.d/myupgrade <<'EOF'
+# Setup reboots when running outdated stuff, unattended upgrades happen
+# at 6 am + rand(60 min).
+20 7 * * * root /usr/local/bin/myupgrade | /usr/local/bin/log-once -1 myupgrade
+0 * * * * root /usr/local/bin/mycheckrestart | /usr/local/bin/log-once -1 mycheckrestart
+EOF
+##### end automatic upgrades ####
+
+
 
-# website setup
+###### begin website setup
 case $HOSTNAME in
-    lj|li)
-
-        case $HOSTNAME in
-            lj) domain=iank.bid; exit 0 ;;
-            li) domain=iankelling.org ;;
-        esac
-        /a/h/setup.sh $domain
-        /a/h/build.rb
-
-        sudo -E /a/bin/mediawiki-setup/mw-setup-script
-
-        pi-nostart mumble-server
-        s $sed -ri "s/^ *(serverpassword=).*/\1$(< /a/bin/bash_unpublished/mumble_pass)/" /etc/mumble-server.ini
-
-        # do certificate to avoid warning about unsigned cert,
-        # which is overkill for my use, but hey, I'm cool, I know
-        # how to do this.
-        web-conf apache2 mumble.iankelling.org
-        s rm -f /etc/apache2/sites-enabled/mumble.iankelling.org
-        sudo -i <<'EOF'
+  li|l2)
+    f=/var/lib/bind/db.b8.nz
+    if [[ ! -e $f ]]; then
+      ser stop bind9
+      s rm -fv $f.jnl
+      s install -m 644 -o bind -g bind /p/c/machine_specific/linode/bind-initial/db.b8.nz $f
+      ser restart bind9
+    fi
+    ;;&
+  l2)
+    end
+    ;;
+  li)
+
+    case $HOSTNAME in
+      li) domain=iankelling.org ;;
+    esac
+    m /a/h/setup.sh $domain
+    m /a/h/build.rb
+
+    # start mumble only when im going to use it, since i dont use it much
+    pi-nostart mumble-server
+    s $sed -ri "s/^ *(serverpassword=).*/\1$(< /a/bin/bash_unpublished/mumble_pass)/" /etc/mumble-server.ini
+
+    # do certificate to avoid warning about unsigned cert,
+    # which is overkill for my use, but hey, I'm cool, I know
+    # how to do this.
+    m web-conf apache2 mumble.iankelling.org
+    s rm -fv /etc/apache2/sites-enabled/mumble.iankelling.org
+    s <<'EOF'
 export RENEWED_LINEAGE=/etc/letsencrypt/live/mumble.iankelling.org
 /a/bin/distro-setup/certbot-renew-hook
 EOF
 
-        sgo mumble-server
 
-        vpn-server-setup -rd
-        s tee /etc/openvpn/client-config/mail <<'EOF'
+    # requested from linode via a support ticket.
+    # https://www.linode.com/docs/networking/an-overview-of-ipv6-on-linode/
+    # ipv6 stuff pieced together
+    # via slightly wrong information from
+    # https://github.com/angristan/openvpn-install/blob/master/openvpn-install.sh
+    # https://community.openvpn.net/openvpn/wiki/IPv6
+    # and man openvpn
+
+    m vpn-server-setup -rd 2600:3c00:e000:280::1/64 2600:3c00::f03c:91ff:feb4:0bf3
+    s tee /etc/openvpn/client-config/mail <<'EOF'
 ifconfig-push 10.8.0.4 255.255.255.0
+ifconfig-ipv6-push 2600:3c00:e000:280::2/64
 EOF
 
+    if [[ -e /lib/systemd/system/openvpn-server@.service ]]; then
+      vpn_service=openvpn-server@server
+    else
+      vpn_service=openvpn@server
+    fi
 
-        sudo dd of=/etc/systemd/system/vpnmail.service <<EOF
+    sudo dd of=/etc/systemd/system/vpnmail.service <<EOF
 [Unit]
 Description=Turns on iptables mail nat
 
@@ -373,321 +468,164 @@ ExecStart=/a/bin/distro-setup/vpn-mail-forward start
 ExecStop=/a/bin/distro-setup/vpn-mail-forward stop
 
 [Install]
-WantedBy=openvpn.service
+WantedBy=$vpn_service.service
 EOF
-        ser daemon-reload
-        ser enable vpnmail.service
-        # needed for li's local mail delivery.
-        tu /etc/hosts <<<"10.8.0.4 mail.iankelling.org"
-        if [[ -e /lib/systemd/system/openvpn-server@.service ]]; then
-            vpn_service=openvpn-server@server
-        else
-            vpn_service=openvpn@server
-        fi
-        sgo $vpn_service
-        # setup let's encrypt cert
-        web-conf apache2 mail.iankelling.org
-        s rm /etc/apache2/sites-enabled/mail.iankelling.org{,-redir}.conf
-        ser reload apache2
-
-        domain=cal.iankelling.org
-        web-conf -f 10.8.0.4:5232 - apache2 $domain <<'EOF'
+    ser daemon-reload
+    m sgo vpnmail.service
+    # needed for li's local mail delivery.
+    tu /etc/hosts <<<"10.8.0.4 mail.iankelling.org"
+    m sgo $vpn_service
+    # setup let's encrypt cert
+    m web-conf apache2 mail.iankelling.org
+    s rm -fv /etc/apache2/sites-enabled/mail.iankelling.org{,-redir}.conf
+    ser reload apache2
+
+    domain=cal.iankelling.org
+    web-conf -f 10.8.0.4:5232 - apache2 $domain <<'EOF'
 #https://httpd.apache.org/docs/2.4/mod/mod_authn_core.html#authtype
 # https://stackoverflow.com/questions/5011102/apache-reverse-proxy-with-basic-authentication
-        <Location />
-                Options +FollowSymLinks +Multiviews +Indexes
-                AllowOverride None
-                AuthType basic
-                AuthName "Authentication Required"
-                # setup one time, with root:www-data, 640
-                AuthUserFile "/etc/caldav-htpasswd"
-                Require valid-user
-        </Location>
+<Location />
+   Options +FollowSymLinks +Multiviews +Indexes
+   AllowOverride None
+   AuthType basic
+   AuthName "Authentication Required"
+   # setup one time, with root:www-data, 640
+   AuthUserFile "/etc/caldav-htpasswd"
+   Require valid-user
+</Location>
 EOF
-        # nginx version of above would be:
-        # auth_basic "Not currently available";
-        # auth_basic_user_file /etc/nginx/caldav/htpasswd;
+    # nginx version of above would be:
+    # auth_basic "Not currently available";
+    # auth_basic_user_file /etc/nginx/caldav/htpasswd;
 
 
-        ########## begin pump.io setup ##########
 
-        # once pump adds a logrotation script, turn off nologger,
-        # and add
-        #        "logfile": "/var/log/pumpio/pumpio.log",
-        #
-        s dd of=/etc/pump.io.json <<'EOF'
-{
-    "secret":  "SECRET_REPLACE_ME",
-    "driver":  "mongodb",
-    "params":  { "dbname": "pumpio" },
-    "noweb":  false,
-    "site":  "pump.iankelling.org",
-    "owner":  "Ian Kelling",
-    "ownerURL":  "https://iankelling.org/",
-    "port":  8001,
-    "urlPort": 443,
-    "hostname":  "pump.iankelling.org",
-    "nologger": true,
-    "datadir": "/home/pumpio/pumpdata",
-    "enableUploads": true,
-    "debugClient": false,
-    "disableRegistration": true,
-    "noCDN": true,
-    "key": "/home/pumpio/privkey.pem",
-    "cert": "/home/pumpio/fullchain.pem",
-    "address":  "localhost",
-    "sockjs": false
-}
-EOF
-        s sed -i "s#SECRET_REPLACE_ME#$(cat /p/c/machine_specific/li/pump-secret)#" /etc/pump.io.json
-
-        # stretch node is too old
-        # https://nodejs.org/en/download/package-manager/
-        curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash -
-        pi nodejs
-        cd /home/iank
-        if [[ -e pump.io ]]; then
-            cd pump.io
-            git pull
-        else
-            git clone https://github.com/pump-io/pump.io.git
-            cd pump.io
-        fi
-        # note: doing this or the npm install pump.io as root had problems.
-        npm install
-        npm run build
-        # normally, next command would be
-        # s npm install -g databank-mongodb
-        # but it\'s this until a bug in pump gets fixed
-        # https://github.com/pump-io/pump.io/issues/1287
-        s npm install -g databank-mongodb@0.19.2
-        if ! getent passwd pumpio &>/dev/null; then
-            s useradd -m -s /bin/false pumpio
-        fi
-        sudo -u pumpio mkdir -p /home/pumpio/pumpdata
-        # for testing browser when only listening to localhost,
-        # in the pump.io.json, set hostname localhost, urlPort 5233
-        #ssh -L 5233:localhost:5233 li
-
-        s mkdir -p /var/log/pumpio/
-        s chown pumpio:pumpio /var/log/pumpio/
-
-        web-conf - apache2 pump.iankelling.org <<'EOF'
-# currently a bug in pump that we cant terminate ssl
-         SSLProxyEngine On
-         ProxyPreserveHost On
-         ProxyPass /  https://127.0.0.1:8001/
-         ProxyPassReverse /  https://127.0.0.1:8001/
-         # i have sockjs disabled per people suggesting that
-         # it won\'t work with apache right now.
-         # not sure if it would work with this,
-         # but afaik, this is pointless atm.
-         <Location /main/realtime/sockjs/>
-             ProxyPass wss://127.0.0.1:8001/main/realtime/sockjs/
-             ProxyPassReverse wss://127.0.0.1:8001/main/realtime/sockjs/
-         </Location>
-EOF
+    ###### begin znc setup #####
+    pi znc
 
-        sudo -i <<'EOF'
-export RENEWED_LINEAGE=/etc/letsencrypt/live/pump.iankelling.org
+    # https://wiki.znc.in/FAQ seems to imply that znc doesn\'t need restart after cert change.
+    # to get into the web interface,
+    # then use non-main browser or else it doebsn't allow it based on ocsp stapling from my main site.
+    # https://iankelling.org:12533/
+    sudo -i <<'EOF'
+export RENEWED_LINEAGE=/etc/letsencrypt/live/iankelling.org
 /a/bin/distro-setup/certbot-renew-hook
 EOF
 
-        s dd of=/etc/systemd/system/pump.service <<'EOF'
+    # znc config generated by doing
+    # znc --makeconf
+    # selected port is also used in erc config
+    # comma separated channel list worked.
+    # while figuring things out, running znc -D for debug in foreground.
+    # to exit and save config:
+    # /msg *status shutdown
+    # configed auth on freenode by following
+    # https://wiki.znc.in/Sasl:
+    # /msg *sasl RequireAuth yes
+    # /msg *sasl Mechanism PLAIN
+    # /msg *sasl Set ident_name password
+    # created the system service after, and had to do
+    # mv /home/iank/.znc/* /var/lib/znc
+    # sed -i 's,/home/iank/.znc/,/var/lib/znc,' /var/lib/znc/config/znc.conf
+    # and made a copy of the config files into /p/c
+    # /msg *status LoadMod --type=global log -sanitize
+    # todo: in config file AllowWeb = true should be false. better security if that is off unless we need it.
+    # /msg *status LoadMod --type=network perform
+    # /msg *perform add PRIVMSG ChanServ :invite #fsf-office
+    # /msg *perform add JOIN #fsf-office
+    #
+    # i set  Buffer = 500
+    # also ran /znc LoadMod clearbufferonmsg
+    # it would be nice if erc supported erc query buffers by doing
+    # /msg *status clearbuffer <name of the query/receiver
+    # on killing the,
+    # an example seems to be here:	https://github.com/zenspider/elisp/blob/master/rwd-irc.el
+    # if that was the case i could remove the module clearbufferonmsg
+    # also would be nice if erc supported
+    # https://wiki.znc.in/self-message
+    # https://wiki.znc.in/Query_buffers                                                \
+      #
+    s useradd --create-home -d /var/lib/znc --system --shell /sbin/nologin --comment "Account to run ZNC daemon" --user-group znc || [[ $? == 9 ]] # 9 if it exists already
+    s chmod 700 /var/lib/znc
+    s chown -R znc:znc /var/lib/znc
+    sd /etc/systemd/system/znc.service 2>/dev/null <<'EOF'
 [Unit]
-Description=pump.io
-After=syslog.target network.target
+Description=ZNC, an advanced IRC bouncer
+After=network-online.target
 
 [Service]
-Type=simple
-User=pumpio
-Group=pumpio
-ExecStart=/home/iank/pump.io/bin/pump
-Environment=NODE_ENV=production
-# failed to find databank-mongodb without this.
-# I just looked at my environment variables took a guess.
-Environment=NODE_PATH=/usr/lib/nodejs:/usr/lib/node_modules:/usr/share/javascript
+ExecStart=/usr/bin/znc -f --datadir=/var/lib/znc
+User=znc
 
 [Install]
 WantedBy=multi-user.target
 EOF
-        ser daemon-reload
-        sgo pump
-        ########## end pump.io setup ############
-
-
-        ############# begin setup mastodon ##############
-
-        # main doc is Docker-Guide.md in docs repo
-
-        # I'd like to try gnu social just cuz of gnu, but it's not being
-        # well maintained, for example, simple pull requests
-        # languishing:
-        # https://git.gnu.io/gnu/gnu-social/merge_requests/143
-        # and I submitted my own bugs, basic docs are broken
-        # https://git.gnu.io/gnu/gnu-social/issues/269
-
-        # note, docker required, but we installed it earlier
-
-        # i subscrubed to https://github.com/docker/compose/releases.atom
-        # to deal with updates manually. So far, it means just reving the
-        # version number, then restarting docker-compose with
-        # cd ~/mastodon
-        # docker-compose up -d
-        curl -L https://github.com/docker/compose/releases/download/1.13.0/docker-compose-`uname -s`-`uname -m` | s dd of=/usr/local/bin/docker-compose
-        s chmod +x /usr/local/bin/docker-compose
-
-
-        cd ~
-        s rm -rf mastodon
-        i clone https://github.com/tootsuite/mastodon
-        cd mastodon
-        # subbed to atom feed to deal with updates
-        git checkout $(git tag | grep -v rc | tail -n1)
-
-        # per instructions, uncomment redis/postgres persistence in docker-compose.yml
-        sed -i 's/^#//' docker-compose.yml
-
-        cat >.env.production <<'EOF'
-REDIS_HOST=redis
-REDIS_PORT=6379
-DB_HOST=db
-DB_USER=postgres
-DB_NAME=postgres
-DB_PASS=
-DB_PORT=5432
-
-LOCAL_DOMAIN=mast.iankelling.org
-LOCAL_HTTPS=true
-
-SINGLE_USER_MODE=true
-
-SMTP_SERVER=10.8.0.4
-SMTP_PORT=25
-SMTP_LOGIN=li
-SMTP_FROM_ADDRESS=notifications@mast.iankelling.org
-SMTP_DOMAIN=mast.iankelling.org
-SMTP_DELIVERY_METHOD=smtp
-EOF
-
-        for key in PAPERCLIP_SECRET SECRET_KEY_BASE OTP_SECRET; do
-            # 1 minute 7 seconds to run this docker command
-            # to generate a secret. wtf, wtf, wtf, wtf
-            printf "%s=%s\n" $key "$(docker-compose run --rm web rake secret|tail -n1)" >>.env.production
-        done
-        found=false
-        s cat /etc/mailpass| while read -r domain port pass; do
-            if [[ $domain == mail.iankelling.org ]]; then
-                found=true
-                printf "SMTP_PASSWORD=%s\n" "$pass" >>.env.production
-                break
-            fi
-        done
-        if ! $found; then
-            echo "$0: error, failed to find mailpass domain for mastadon"
-            exit 1
-        fi
-
-        docker-compose run --rm web rake mastodon:webpush:generate_vapid_key | grep -E '^VAPID_PUBLIC_KEY=|^VAPID_PRIVATE_KEY=' >> .env.production
-        logq docker-compose run --rm web rake db:migrate
-        docker-compose run --rm web rails assets:precompile
-
-        # docker daemon takes care of starting on boot.
-        docker-compose up -d
-
-        s a2enmod proxy_wstunnel headers
-        web-conf -f 3000 - apache2 mast.iankelling.org <<'EOF'
-   ProxyPreserveHost On
-   RequestHeader set X-Forwarded-Proto "https"
-   ProxyPass /500.html !
-   ProxyPass /oops.png !
-   ProxyPass /api/v1/streaming/ ws://localhost:4000/
-   ProxyPassReverse /api/v1/streaming/ ws://localhost:4000/
-   ErrorDocument 500 /500.html
-   ErrorDocument 501 /500.html
-   ErrorDocument 502 /500.html
-   ErrorDocument 503 /500.html
-   ErrorDocument 504 /500.html
-EOF
-
-
-        ############### !!!!!!!!!!!!!!!!!
-        ############### manual steps:
-
-        # only following 2 people atm, so not bothering to figure out backups
-        # when mastodon has not documented it at all.
-        #
-        # fsf@status.fsf.org
-        # cwebber@toot.cat
-        # dbd@status.fsf.org
-        # johns@status.fsf.org
-
-        # sign in page is at https://mast.iankelling.org/auth/sign_in
-        # register as iank, then
-        # https://github.com/tootsuite/documentation/blob/master/Running-Mastodon/Administration-guide.md
-        # docker-compose run --rm web bundle exec rails mastodon:make_admin USERNAME=iank
-
-        ############# end setup mastodon ##############
-
-        # we use nsupdate to update the ip of home
-        pi bind9
+    ser daemon-reload
+    # avoid restarting if possible, reconnecting to irc is annoying.
+    if [[ $(ser is-active znc) != active ]]; then
+      m sgo znc
+    fi
+    ###### stop znc setup #####
 
-        echo "$0: $(date): ending now)"
-        exit 0
-        ;;
+    end
+    ;;
 esac
-
+###### end website setup
 
 ########### end section including li/lj ###############
 
-case $distro in
-    debian) spa gnome-session-flashback ;;
-    # flidas is missing dependency gnome-panel. others unknown
-esac
-
-
-
-case $distro in
-    trisquel|ubuntu|debian) spa ack-grep ;;
-    arch|fedora) spa ack ;;
-    # fedora unknown
+#### desktop stuff
+case $codename_compat in
+  xenial)
+    # mate-indicator-applet and beyond are msc things I noticed diffing a
+    # standard install with mine.
+    pi xorg lightdm mate-desktop-environment mate-desktop-environment-extras mate-indicator-applet anacron
+    ;;
+  stretch)
+    pi task-mate-desktop
+    ;;
+  buster)
+    # mate doesnt have wayland support yet
+    pi task-gnome-desktop
+    ;;
 esac
 
 
-if isdeb; then
-    spa debian-goodies
-fi
 
 
-case $distro in
-    debian)
-        pi chromium ;;
-    xenial|ubuntu)
-        wget -qO - https://downloads.iridiumbrowser.de/ubuntu/iridium-release-sign-01.pub|sudo apt-key add -
-        cat <<EOF | sudo tee /etc/apt/sources.list.d/iridium-browser.list
-deb [arch=amd64] https://downloads.iridiumbrowser.de/deb/ stable main
-#deb-src https://downloads.iridiumbrowser.de/deb/ stable main
-EOF
-        p update
-        pi iridium-browser
-        ;;
-esac
-
-case $distro in
-    debian)
-        spa cpio-doc ;;
-    # not packaged in flidas. others unknown. gfdl nonfree issue
-esac
-
+# TODO: some of the X programs can be removed from pall when using wayland
 
+# depends gcc is a way to install suggests. this is apparently the only
+# way to install suggests even if the main package is already
+# installed. reinstall doesn't work, uninstalling can cause removing
+# dependent packages.
+pi ${pall[@]} $(apt-cache search ruby[.0-9]+-doc| awk '{print $1}') $(apt-cache depends gcc|grep -i suggests:| awk '{print $2}') $($src/distro-pkgs)
 
 
-case $distro in
-    fedora) spa unrar ;;
-    *) spa unrar-free ;;
-esac
+m sgo fsf-vpn-dns-cleanup
 
 
+# website is dead june 14 2019. back in october, but meh
+s rm -fv /etc/apt/sources.list.d/iridium-browser.list
+# case $distro in
+#   debian)
+#     pi chromium ;;
+#   trisquel|ubuntu)
+#     wget -qO - https://downloads.iridiumbrowser.de/ubuntu/iridium-release-sign-01.pub|sudo apt-key add -
+#     t=$(mktemp)
+#     cat >$t <<EOF
+# deb [arch=amd64] https://downloads.iridiumbrowser.de/deb/ stable main
+# #deb-src https://downloads.iridiumbrowser.de/deb/ stable main
+# EOF
+#     f=/etc/apt/sources.list.d/iridium-browser.list
+#     if ! diff -q $t $f; then
+#       s cp $t $f
+#       s chmod 644 $f
+#       p update
+#     fi
+#     pi iridium-browser
+#     ;;
+# esac
 
 
 ### begin home vpn server setup
@@ -701,38 +639,39 @@ esac
 # vpn-server-setup -rds
 # s cp -r --parents /etc/openvpn/easy-rsa/keys /p/c/filesystem
 # s chown -R 1000:1000 /p/c/filesystem/etc/openvpn/easy-rsa/keys
-# for host in x2 kw; do
-#     vpn-mk-client-cert -b $host -n home b8.nz
-#     dir=/p/c/machine_specific/$host/filesystem/etc/openvpn/client
-#     mkdir -p $dir
-#     s bash -c "cp /etc/openvpn/client/home* $dir"
+# # kw = kgpe work machine.
+# for host in x2 x3 kw; do
+# vpn-mk-client-cert -b $host -n home b8.nz 1196
+# dir=/p/c/machine_specific/$host/filesystem/etc/openvpn/client
+# mkdir -p $dir
+# s bash -c "cp /etc/openvpn/client/home* $dir"
 #     # note: /etc/update-resolv-conf-home also exists for all systems with /p
 # done
 
-
-vpn-server-setup -rds
+# key already exists, so this won't generate one, just the configs.
+m vpn-server-setup -rds
 s tee -a /etc/openvpn/server/server.conf <<'EOF'
-push "dhcp-option DNS 192.168.1.1"
-push "route 192.168.1.0 255.255.255.0"
+push "dhcp-option DNS 10.0.0.1"
+push "route 10.0.0.0 255.255.0.0"
 client-connect /a/bin/distro-setup/vpn-client-connect
 EOF
-s sed -i --follow-symlinks 's/10.8./10.9./g' /etc/openvpn/server/server.conf
+s sed -i --follow-symlinks 's/10.8./10.9./g;s/^\s*port\s.*/port 1196/' /etc/openvpn/server/server.conf
 
 if [[ $HOSTNAME == tp ]]; then
-    if [[ -e /lib/systemd/system/openvpn-server@.service ]]; then
-        vpn_service=openvpn-server@server
-    else
-        vpn_service=openvpn@server
-    fi
-    sgo $vpn_service
+  if [[ -e /lib/systemd/system/openvpn-server@.service ]]; then
+    vpn_service=openvpn-server@server
+  else
+    vpn_service=openvpn@server
+  fi
+  m sgo $vpn_service
 fi
 ### end vpn server setup
 
-if [[ $HOSTNAME == tp ]]; then
 
-    # note, see bashrc for more documentation.
-    pi rss2email
-    s dd of=/etc/systemd/system/rss2email.service <<'EOF'
+##### rss2email
+# note, see bashrc for more documentation.
+pi rss2email
+sd /etc/systemd/system/rss2email.service <<'EOF'
 [Unit]
 Description=rss2email
 After=multi-user.target
@@ -745,7 +684,7 @@ Type=oneshot
 # we pass options to use different location.
 ExecStart=/a/bin/log-quiet/sysd-mail-once -288 rss2email r2e -d /p/c/rss2email.json -c /p/c/rss2email.cfg run
 EOF
-    s dd of=/etc/systemd/system/rss2email.timer <<'EOF'
+sd /etc/systemd/system/rss2email.timer <<'EOF'
 [Unit]
 Description=rss2email
 
@@ -758,13 +697,12 @@ OnUnitInactiveSec=300
 [Install]
 WantedBy=timers.target
 EOF
-    s systemctl daemon-reload
-    sgo rss2email.timer
-fi
+s systemctl daemon-reload
+
 
 ######### begin  pump.io periodic backup #############
-if [[ $HOSTNAME == tp ]]; then
-    s dd of=/etc/systemd/system/pumpbackup.service <<'EOF'
+if [[ $HOSTNAME == frodo ]]; then
+  sd /etc/systemd/system/pumpbackup.service <<'EOF'
 [Unit]
 Description=pump li backup
 After=multi-user.target
@@ -774,7 +712,7 @@ User=iank
 Type=oneshot
 ExecStart=/a/bin/log-quiet/sysd-mail-once pump-backup /a/bin/distro-setup/pump-backup
 EOF
-    s dd of=/etc/systemd/system/pumpbackup.timer <<'EOF'
+  sd /etc/systemd/system/pumpbackup.timer <<'EOF'
 [Unit]
 Description=pump li backup hourly
 
@@ -784,123 +722,178 @@ OnCalendar=hourly
 [Install]
 WantedBy=timers.target
 EOF
-    s systemctl daemon-reload
-    sgo pumpbackup.timer
+  ser daemon-reload
+  m sgo pumpbackup.timer
 fi
 #########  end  pump.io periodic backup #############
 
+
+######### begin irc periodic backup #############
+if [[ $HOSTNAME == frodo ]]; then
+  sd /etc/systemd/system/ircbackup.service <<'EOF'
+[Unit]
+Description=irc li backup
+After=multi-user.target
+
+[Service]
+User=iank
+Type=oneshot
+ExecStart=/a/bin/log-quiet/sysd-mail-once irc-backup rsync -rlptDhSAX root@iankelling.org:/var/lib/znc/moddata/log/iank/freenode/ /k/irclogs
+EOF
+  sd /etc/systemd/system/ircbackup.timer <<'EOF'
+[Unit]
+Description=irc li backup hourly
+
+[Timer]
+OnCalendar=hourly
+
+[Install]
+WantedBy=timers.target
+EOF
+  s systemctl daemon-reload
+  sgo ircbackup.timer
+fi
+
+
+######### end irc periodic backup #############
+
+
 case $distro in
-    debian|trisquel|ubuntu)
-        # suggests because we want the resolvconf package.
-        # todo: check other distros to make sure it\'s installed
-        pi-nostart --install-suggests openvpn
-        # pi-nostart does not disable
-        ser disable openvpn
-        ;;
-    *) pi openvpn;;
+  debian|trisquel|ubuntu)
+    # suggests resolvconf package. installing it here is redundant, but make sure anyways.
+    # todo: check other distros to make sure it\'s installed
+    pi-nostart openvpn resolvconf
+    # pi-nostart does not disable
+    ser disable openvpn
+    ;;
+  *) pi openvpn;;
 esac
 
-/a/bin/distro-setup/radicale-setup
-
-## android studio setup
-# this contains the setting for android sdk to point to
-# /a/opt/androidsdk, which is asked upon first run
-lnf /a/opt/.AndroidStudio2.2 ~
-# android site says it needs a bunch of packages for ubuntu,
-# but I googled for debian, and someone says you just need lib32stdc++6 plus the
-# jdk
-# https://pid7007blog.blogspot.com/2015/07/installing-android-studio-in-debian-8.html
-# see w.org for more android studio details
-spa lib32stdc++6 default-jdk
+m /a/bin/distro-setup/radicale-setup
 
 
+############# begin syncthing setup ###########
 if [[ $HOSTNAME == frodo ]]; then
-    ############# begin syncthing setup ###########
-
-    # It\'s simpler to just worry about running it in one place for now.
-    # I assume it would work to clone it\'s config to another non-phone
-    # and just run it in one place instead of the normal having a
-    # separate config.  I lean toward using the same config, since btrfs
-    # syncs between comps.
-    case $distro in
-        arch) pi syncthing ;;
-        trisquel|ubuntu|debian)
-            # testing has relatively up to date packages
-            if ! isdebian-testing; then
-                # based on error when doing apt-get update:
-                # E: The method driver /usr/lib/apt/methods/https could not be found.
-                pi apt-transport-https
-                # google led me here:
-                # https://apt.syncthing.net/
-                curl -s https://syncthing.net/release-key.txt | sudo apt-key add -
-                s="deb http://apt.syncthing.net/ syncthing release"
-                if [[ $(cat /etc/apt/sources.list.d/syncthing.list) != $s ]]; then
-                    echo "$s" | s dd of=/etc/apt/sources.list.d/syncthing.list
-                    p update
-                fi
-            fi
-            pi syncthing
-            ;;
-    esac
-    lnf -T /w/syncthing /home/iank/.config/syncthing
-    sgo syncthing@iank # runs as iank
-
-    # these things persist in ~/.config/syncthing, which I save in
-    # /w/syncthing (not in /p, because syncthing should continue to
-    # run on home server even when using laptop as primary device)
-    # open http://localhost:8384/
-    # change listen address from default to tcp://:22001,
-    # this is because we do port forward so it doesn\'t have to use
-    # some external server, but the syncthing is broken for port forward,
-    # you get a message, something "like connected to myself, this should not happen"
-    # when connecting to other local devices, so I bump the port up by 1,
-    # based on
-    # https://forum.syncthing.net/t/connected-to-myself-should-not-happen/1763/19.
-    # Without this, it was being stuck syncing at 0%.
-    # Set gui username and password.
-    #
-    # install syncthing via f-droid,
-    # folder setting, turn off master folder (makes it read only).
-    # on phone, add device, click bar code icon
-    # on dekstop, top right, actions, device id
-    # after adding, notification will appear on desktop to confirm
-    #
-    # syncing folder. from phone to desktop: select desktop in the
-    # folder on phone\'s sync options, notification will appear in
-    # desktop\'s web ui within a minute. For the reverse, the
-    # notification will appear in android\'s notifications, you have to
-    # swipe down and tap it to add the folder. It won\'t appear in the
-    # syncthing ui, which would be intuitive, but don\'t wait for it
-    # there.
-    #
-    # On phone, set settings to run syncthing all the time, and
-    # show no notification.
-    #
-    # Folder versioning would make sense if I didn\'t already use btrfs
-    # for backups. I would choose staggered, or trash can for more space.
-    #
-    # if needed to install on a remote comp:
-    # ssh -L 8384:localhost:8384 -N frodo
-    # open http://localhost:8384/
-    #
-    # Note, the other thing i did was port forward port 22000,
-    # per https://docs.syncthing.net/users/firewall.html
+  # It\'s simpler to just worry about running it in one place for now.
+  # I assume it would work to clone it\'s config to another non-phone
+  # and just run it in one place instead of the normal having a
+  # separate config.  I lean toward using the same config, since btrfs
+  # syncs between comps.
+  # testing has relatively up to date packages
+  if ! isdebian-testing; then
+    # based on error when doing apt-get update:
+    # E: The method driver /usr/lib/apt/methods/https could not be found.
+    pi apt-transport-https
+    # google led me here:
+    # https://apt.syncthing.net/
+    curl -s https://syncthing.net/release-key.txt | sudo apt-key add -
+    s="deb http://apt.syncthing.net/ syncthing release"
+    if [[ $(cat /etc/apt/sources.list.d/syncthing.list) != "$s" ]]; then
+      echo "$s" | sd /etc/apt/sources.list.d/syncthing.list
+      p update
+    fi
+  fi
+  pi syncthing
+  m lnf -T /w/syncthing /home/iank/.config/syncthing
+  ser daemon-reload # syncthing likely not properly packaged
+  m sgo syncthing@iank # runs as iank
+
+  # these things persist in ~/.config/syncthing, which I save in
+  # /w/syncthing (not in /p, because syncthing should continue to
+  # run on home server even when using laptop as primary device)
+  # open http://localhost:8384/
+  # change listen address from default to tcp://:22001,
+  # this is because we do port forward so it doesn\'t have to use
+  # some external server, but the syncthing is broken for port forward,
+  # you get a message, something "like connected to myself, this should not happen"
+  # when connecting to other local devices, so I bump the port up by 1,
+  # based on
+  # https://forum.syncthing.net/t/connected-to-myself-should-not-happen/1763/19.
+  # Without this, it was being stuck syncing at 0%.
+  # Set gui username and password.
+  #
+  # install syncthing via f-droid,
+  # folder setting, turn off send only.
+  # on phone, add device, click bar code icon
+  # on dekstop, top right, actions, device id
+  # after adding, notification will appear on desktop to confirm
+  #
+  # syncing folder. from phone to desktop: select desktop in the
+  # folder on phone\'s sync options, notification will appear in
+  # desktop\'s web ui within a minute. For the reverse, the
+  # notification will appear in android\'s notifications, you have to
+  # swipe down and tap it to add the folder. It won\'t appear in the
+  # syncthing ui, which would be intuitive, but don\'t wait for it
+  # there. The notification may not work, instead open the web gui
+  # from in the app, there should be a notification within there.
+  #
+  # On phone, set settings to run syncthing all the time, and
+  # show no notification.
+  #
+  # Folder versioning would make sense if I didn\'t already use btrfs
+  # for backups. I would choose staggered, or trash can for more space.
+  #
+  # if needed to install on a remote comp:
+  # ssh -L 8384:localhost:8384 -N frodo
+  # open http://localhost:8384/
+  #
+  # Note, the other thing i did was port forward port 22000,
+  # per https://docs.syncthing.net/users/firewall.html
 
-    #############  end syncthing setup ###########
 fi
+#############  end syncthing setup ###########
 
 
 
-# no equivalent in other distros:
-case $distro in
-    debian|trisquel|ubuntu)
-        # for gui bug reporting
-        spa python-vte
-        ;;
+####### begin misc packages ###########
+
+case $codename in
+  flidas)
+
+  ;;
 esac
 
 
-####### misc packages ###########
+# sakura config is owned by ian
+m reset-sakura
+m reset-konsole
+m sudo -u user2 -i reset-konsole
+# user2 xscreensaver we don't want to reset
+m reset-xscreensaver
+
+
+# this would install from cabal for newer / consistent version across os, but it screws up xmonad, so disabled for now.
+# this is also in primary-setup
+# pi libxss-dev # dependency based on build failure
+# cabal update
+# cabal install --upgrade-dependencies  --force-reinstalls arbtt
+# also, i assume syncing this between machines somehow messed thin
+#lnf -T /m/arbtt-capture.log ~/.arbtt/capture.log
+
+m primary-setup
+
+if [[ ! -e ~/.linphonerc && -e /p/.linphonerc-initial ]]; then
+  m cp /p/.linphonerc-initial ~/.linphonerc
+fi
+
+
+### begin spd install
+pi libswitch-perl libdigest-md5-file-perl libgnupg-interface-perl
+t=$(mktemp)
+m wget -O $t http://mirror.fsf.org/fsfsys-trisquel/fsfsys-trisquel/pool/main/s/spd-perl/spd-perl_0.2-1_amd64.deb
+s dpkg -i $t
+m rm $t
+# this guesses at the appropriate directory, adjust if needed
+perldir=(/usr/lib/x86_64-linux-gnu/perl/5.*)
+m sudo ln -sf ../../../perl/5.18.2/SPD/ ${perldir[0]}
+# newer distro had gpg2 as default, older one, flidas, need to make it that way
+gpgpath=$(which gpg2)
+if [[ $x ]]; then
+  s mkdir -p /usr/local/spdhackfix
+  s lnf -T $gpgpath /usr/local/spdhackfix/gpg
+fi
+### end spd install
+
 
 # nagstamon setting which were set through the ui
 # in filters tab:
@@ -913,107 +906,192 @@ esac
 # services on unreachable osts
 # hosts in soft state
 # services in soft state
-# in display tab: icon in systray.
-
-case $distro in
-    debian|trisquel|ubuntu)
-        # it asks if it should make users in it's group capture packets without root,
-        # which is arguably more secure than running wireshark as root. default is no,
-        # which is what i prefer, since I plan to use tcpdump to input to wireshark.
-        s DEBIAN_FRONTEND=noninteractive pi wireshark-gtk
-        ;;
-    # others unknown
-esac
+# in display tab: fullscreen
+
+# these translate to these settings I think
+# filter_acknowledged_hosts_services = True
+# filter_all_unknown_services = True
+# filter_all_warning_services = True
+# filter_hosts_in_soft_state = True
+# filter_hosts_services_maintenance = True
+# filter_services_in_soft_state = True
+# filter_services_on_down_hosts = True
+# filter_services_on_hosts_in_maintenance = True
+# filter_services_on_unreachable_hosts = True
+# notify_if_up = False
+# statusbar_floating = False
+# fullscreen = True
+# but i'm just going to rely on the webpage plus sms for now.
+
+
+# it asks if it should make users in it's group capture packets without root,
+# which is arguably more secure than running wireshark as root. default is no,
+# which is what i prefer, since I plan to use tcpdump to input to wireshark.
+s DEBIAN_FRONTEND=noninteractive pi wireshark-gtk
+
+# /run and /dev/shm are listed as required for pulseaudio. All 4 in the group
+# listed in the default config as suggested.
+# /run/usr/1000 i noticed was missing for pulseaudio
+# /run/user/0 just seemed like a not bad idea, given the above
+tu /etc/schroot/desktop/fstab <<'EOF'
+/run           /run            none    rw,bind         0       0
+/run/lock      /run/lock       none    rw,bind         0       0
+/dev/shm       /dev/shm        none    rw,bind         0       0
+/run/shm       /run/shm        none    rw,bind         0       0
+/run/user/1000 /run/user/1000  none    rw,bind         0       0
+/run/user/1001 /run/user/1001  none    rw,bind         0       0
+/run/user/0    /run/user/0     none    rw,bind         0       0
+EOF
 
-s mkdir -p /nocow/user
-s chown $USER:$USER /nocow/user
-case $distro in
+mkschroot() {
+  distro=$1
+  shift
+  case $distro in
+    ubuntu)
+      repo=http://archive.ubuntu.com/ubuntu/
+      ;;
     debian)
-        case $(debian-codename) in
-            jessie)
-                pi anki
-                ;;
-            *)
-                pi debootstrap schroot
-                d=/nocow/user/schroot/anki
-                if [[ -e $d/bin ]]; then
-                    s chroot $d apt-get update
-                    s chroot $d apt-get -y dist-upgrade --purge --auto-remove
-                else
-
-                    mkdir -p /nocow/user/schroot/anki
-                    s debootstrap jessie $d http://deb.debian.org/debian/
-                    s dd of=/etc/schroot/chroot.d/anki.conf <<EOF
-[anki]
-description=Anki on jessie
+      repo=http://deb.debian.org/debian/
+      ;;
+  esac
+  n=$1
+  shift
+  if schroot -l | grep -xFq chroot:$n; then
+    echo "$0: $n schroot already installed, skipping"
+    return 0
+  fi
+  apps=($@)
+  d=/nocow/schroot/$n
+  sd /etc/schroot/chroot.d/$n.conf <<EOF
+[$n]
+description=$n
 type=directory
 directory=$d
 profile=desktop
 preserve-environment=true
-users=$USER
+users=$USER,user2
 EOF
+  if [[ -e $d/bin ]]; then
+    s chroot $d apt-get update
+    s chroot $d apt-get -y dist-upgrade --purge --auto-remove
+    cd; s schroot -c $n -- apt-get install --allow-unauthenticated -y ${apps[@]}
+  else
+    s mkdir -p $d
+
+    s debootstrap $n $d $repo
+    cd; s schroot -c $n -- apt-get install --allow-unauthenticated -y ${apps[@]}
+  fi
+  s cp -P {,$d}/etc/localtime
+}
+sd /etc/systemd/system/schrootupdate.service <<'EOF'
+[Unit]
+Description=schrootupdate
+After=multi-user.target
 
-                    s cp {,$d}/etc/locale.gen
-                    s cp -P {,$d}/etc/localtime
-                    cd
-                    s schroot -c anki -- apt-get install -y anki locales mplayer
-                fi
-                ;;
-        esac
-        ;;
-    trisquel|ubuntu)
-        pi anki
-        ;;
-    # others unknown
-esac
+[Service]
+Type=oneshot
+ExecStart=/a/bin/log-quiet/sysd-mail-once schrootupdate /a/bin/distro-setup/schrootupdate
+EOF
+sd /etc/systemd/system/schrootupdate.timer <<'EOF'
+[Unit]
+Description=schrootupdate
 
+[Timer]
+OnCalendar=*-*-* 04:20:00
+
+[Install]
+WantedBy=timers.target
+EOF
+ser daemon-reload
+m sgo schrootupdate.timer
+
+
+
+# for my roommate
 case $distro in
-    debian|trisquel|ubuntu)
-        # note i had to do this, which is persistent:
-        # cd /i/k
-        # s chgrp debian-transmission torrents partial-torrents
-
-        # syslog says things like
-        # 'Failed to set receive buffer: requested 4194304, got 425984'
-        # google suggets giving it even more than that
-        tu /etc/sysctl.conf<<'EOF'
+  trisquel)
+    m mkschroot debian stretch firefox-esr pulseaudio chromium
+    ;;
+  debian)
+    pi chromium
+    ;;
+esac
+
+s mkdir -p /nocow/user
+s chown $USER:$USER /nocow/user
+pi anki
+
+
+####### begin transmission
+
+# adapted from /var/lib/dpkg/info/transmission-daemon.postinst
+# 450 seems likely to be unused. we need to specify one or else
+# it won't be stable across installs.
+if ! getent passwd debian-transmission > /dev/null; then
+  s groupadd -g 450 debian-transmission
+  s adduser --quiet \
+    --gid 450 \
+    --uid 450 \
+    --system \
+    --no-create-home \
+    --disabled-password \
+    --home /var/lib/transmission-daemon \
+    debian-transmission
+fi
+# We want group writable stuff from transmission.
+# However, after setting this, I learn that transmission sets it's
+# own umask based on it's settings file. Well, no harm leaving this
+# so it's set right from the beginning.
+s chfn debian-transmission -o umask=0002
+
+# note i had to do this, which is persistent:
+# cd /i/k
+# s chgrp debian-transmission torrents partial-torrents
+
+# syslog says things like
+# 'Failed to set receive buffer: requested 4194304, got 425984'
+# google suggets giving it even more than that
+tu /etc/sysctl.conf<<'EOF'
 net.core.rmem_max = 67108864
 net.core.wmem_max = 16777216
 EOF
-        s sysctl -p
-
-        # some reason it doesn\'t seem to start automatically anyways
-        pi-nostart transmission-daemon
-
-        # the folder was moved here after an install around 02/2017.
-        # it contains runtime data,
-        # plus a simple symlink to the config file which it\'s
-        # not worth separating out.
-        # between comps, the uid can change
-        f=/i/transmission-daemon
-        s lnf -T $f /var/lib/transmission-daemon/.config/transmission-daemon
-        if [[ -e $f ]]; then
-            s chown -R debian-transmission:debian-transmission $f
-        fi
-        for f in /i/k/partial-torrents /i/k/torrents; do
-            if [[ -e $f ]]; then
-                s chown -R debian-transmission:traci $f
-            fi
-        done
-        s chown -R debian-transmission:debian-transmission /var/lib/transmission-daemon
-        #
-        # config file documented here, and it\'s the same config
-        # for daemon vs client, so it\'s documented in the gui.
-        # https://trac.transmissionbt.com/wiki/EditConfigFiles#Options
-        #
-        # I originaly setup rpc-whitelist, but after using
-        # routing to a network namespace, it doesn\'t see the
-        # real source address, so it\'s disabled.
-        #
-        # Changed the cache-size to 256 mb, reduces disk use.
-        # It is a read & write cache.
-        #
-        s ruby <<'EOF'
+s sysctl -p
+
+# some reason it doesn\'t seem to start automatically anyways
+pi-nostart transmission-daemon
+# be extra sure its not started
+ser disable transmission-daemon
+ser stop transmission-daemon
+
+# the folder was moved here after an install around 02/2017.
+# it contains runtime data,
+# plus a simple symlink to the config file which it\'s
+# not worth separating out.
+# between comps, the uid can change
+f=/i/transmission-daemon
+s lnf -T $f /var/lib/transmission-daemon/.config/transmission-daemon
+if [[ -e $f ]]; then
+  s chown -R debian-transmission:debian-transmission $f
+fi
+for f in /i/k/partial-torrents /i/k/torrents; do
+  if [[ -e $f ]]; then
+    s chown -R debian-transmission:user2 $f
+  fi
+done
+s chown -R debian-transmission:debian-transmission /var/lib/transmission-daemon
+#
+# config file documented here, and it\'s the same config
+# for daemon vs client, so it\'s documented in the gui.
+# https://trac.transmissionbt.com/wiki/EditConfigFiles#Options
+#
+# I originaly setup rpc-whitelist, but after using
+# routing to a network namespace, it doesn\'t see the
+# real source address, so it\'s disabled.
+#
+# Changed the cache-size to 256 mb, reduces disk use.
+# It is a read & write cache.
+#
+s ruby <<'EOF'
 require 'json'
 p = '/etc/transmission-daemon/settings.json'
 File.write(p, JSON.pretty_generate(JSON.parse(File.read(p)).merge({
@@ -1030,43 +1108,17 @@ File.write(p, JSON.pretty_generate(JSON.parse(File.read(p)).merge({
 "ratio-limit-enabled" => true,
 })) + "\n")
 EOF
+####### end transmission
 
-        # make sure its not enabled, not sure if this is needed
-        ser disable transmission-daemon
-        ;;
-    # todo: others unknown
-esac
-# adapted from /var/lib/dpkg/info/transmission-daemon.postinst
-if ! getent passwd debian-transmission > /dev/null; then
-    case $distro in
-        arch)
-            s useradd \
-              --system \
-              --create-home \
-              --home-dir /var/lib/transmission-daemon \
-              --shell /bin/false \
-              debian-transmission
-            ;;
-        *)
-            s adduser --quiet \
-              --system \
-              --group \
-              --no-create-home \
-              --disabled-password \
-              --home /var/lib/transmission-daemon \
-              debian-transmission
-            ;;
-    esac
-fi
 
 
 # trisquel 8 = openvpn, debian stretch = openvpn-client
 vpn_ser=openvpn-client
 if [[ ! -e /lib/systemd/system/openvpn-client@.service ]]; then
-    vpn_ser=openvpn
+  vpn_ser=openvpn
 fi
 
-s dd of=/etc/systemd/system/transmission-daemon-nn.service <<EOF
+sd /etc/systemd/system/transmission-daemon-nn.service <<EOF
 [Unit]
 Description=Transmission BitTorrent Daemon netns
 After=network.target
@@ -1089,40 +1141,46 @@ EOF
 ser daemon-reload
 
 if [[ $HOSTNAME == frodo ]]; then
-    sgo transmission-daemon-nn
+  m sgo transmission-daemon-nn
 fi
 
 
 ######### begin transmission client setup ######
 
 if [[ -e /p/transmission-rpc-pass ]]; then
-    # arch had a default config,
-    # debian had nothing until you start it.
-    # With a little trial an error, here is a minimal config
-    # taken from the generated one, plus changes that the
-    # settings ui does, without a bunch of ui crap settings.
-    #
-    # only settings I set were
-    # hostname
-    # auto-connect
-    # password
-
-    # the password is randomly generated on first run, i copied it out
-    # so it could be used by other hosts.
-    s ruby <<'EOF'
+  # arch had a default config,
+  # debian had nothing until you start it.
+  # With a little trial an error, here is a minimal config
+  # taken from the generated one, plus changes that the
+  # settings ui does, without a bunch of ui crap settings.
+  #
+  # only settings I set were
+  # hostname
+  # auto-connect
+  # password
+
+  # the password is randomly generated on first run, i copied it out
+  # so it could be used by other hosts.
+  s ruby <<'EOF'
 require 'json'
 p = '/etc/transmission-daemon/settings.json'
 s = JSON.parse(File.read(p))
 s["rpc-password"] = File.read("/p/transmission-rpc-pass").chomp
+# default is 0022 (18 in decimal)
+s["umask"] = 2
 File.write p, JSON.pretty_generate(s)
 EOF
 
-    rpc_pass=$(</p/transmission-rpc-pass)
-    for f in /home/*; do
-        d=$f/.config/transmission-remote-gtk
-        u=${f##*/}
-        s -u $u mkdir -p $d
-        s -u $u dd of=$d/config.json <<EOF
+  rpc_pass=$(</p/transmission-rpc-pass)
+  for f in /home/*; do
+    u=${f##*/}
+    uid=$(id -u $u 2>/dev/null) || continue
+    if [[ ! $uid -ge 1000 ]]; then
+      continue
+    fi
+    d=$f/.config/transmission-remote-gtk
+    s -u $u mkdir -p $d
+    s -u $u dd of=$d/config.json <<EOF
 {
   "profiles" : [
     {
@@ -1151,333 +1209,70 @@ EOF
   "add-options-dialog" : false
 }
 EOF
-    done
+  done
 fi
+######### end transmission client setup ######
 
-# dunno why it\'s there, but get rid of it
-case $HOSTNAME in
-    li|lj) s rm -rf /home/linode ;;
-esac
-
-
-# printer
-case $distro in
-    arch)
-        pi cups ghostscript gsfonts # from arch wiki cups page
-        pi hplip # from google
-        s gpasswd -a $USER sys # from arch wiki
-        sgo org.cups.cupsd.service
-        # goto http://127.0.0.1:631
-        # administration tab, add new printer button.
-        # In debian, I could use hte recommended driver,
-        # in arch, I had to pick out the 6L driver.
-        ;;
-    debian|trisquel|ubuntu)
-        spa hplip
-        ;;
-    # other distros unknown
-esac
-
-
-case $distro in
-    trisquel|ubuntu|debian) pi --no-install-recommends mairix notmuch ;;
-    fedora|arch) spa mairix notmuch ;;
-esac
-case $distro in
-    arch) spa nfs-utils ;;
-    trisquel|ubuntu|debian) spa nfs-client ;;
-esac
-case $distro in
-    trisquel|ubuntu|debian) spa par2 ;;
-    arch|fedora) spa par2cmdline ;;
-esac
-
-# needed for my tex resume
-case $distro in
-    trisquel|ubuntu|debian) spa texlive-full ;;
-    arch) spa texlive-most ;;
-    # fedora unknown
-esac
-
-
-case $distro in
-    # optional dep for firefox for h.264 video
-    arch) spa gst-libav ;;
-    # other distros, probably come by default
-esac
-
-case $distro in
-    fedora|trisquel|ubuntu|debian) spa gnupg-agent ;;
-    arch) : ;;
-esac
-
-
-case $distro in
-    fedora) spa pinentry-gtk ;;
-    *) : ;; # comes default or with other packages
-esac
 
-case $distro in
-    arch) spa firefox pulseaudio;;
-    *) : ;; # comes default or with other packages
-esac
+### printer setup
+pi cups hplip
+s gpasswd -a $USER lpadmin # based on ubuntu wiki
+# goto http://127.0.0.1:631
+# administration tab, add new printer button.
+# In debian, I could use hte recommended driver,
+# in arch, I had to pick out the 6L driver.
 
 
-case $distro in
-    arch) spa ttf-dejavu;;
-    debian|trisquel|ubuntu) spa fonts-dejavu ;;
-    # others unknown
-esac
-
-
-case $distro in
-    arch) spa xorg-xev;;
-    debian|trisquel|ubuntu) spa x11-utils ;;
-    # others unknown
-esac
-
-case $distro in
-    arch) pi virt-install;;&
-    debian|trisquel|ubuntu) pi virtinst ;;&
-    *) pi virt-manager ;; # creates the libvirt group in debian at least
-    # others unknown
-esac
 # allow user to run vms, from debian handbook
-for x in iank traci; do s usermod -a -G libvirt,kvm $x; done
+for x in iank user2; do s usermod -a -G libvirt,kvm $x; done
 # bridge networking as user fails. google lead here, but it doesn\'t work:
 # oh well, I give up.
 # http://wiki.qemu.org/Features-Done/HelperNetworking
 # s mkdir /etc/qemu
 # f=/etc/qemu/bridge.conf
-# s dd of=$f <<'EOF'
+# sd $f <<'EOF'
 # allow br0
 # EOF
 # #s chown root:qemu $f # debian has somethig like qemu-libvirt. equivalent?
 # s chmod 640 $f
 
-
-case $distro in
-    arch) spa cdrkit;;
-    debian|trisquel|ubuntu) spa genisoimage;;
-    # others unknown
-esac
-
-case $distro in
-    arch) spa spice-gtk3 ;;
-    debian|trisquel|ubuntu) spa spice-client-gtk;;
-    # others unknown
-esac
-
 # general known for debian/ubuntu, not for fedora
 
-case $distro in
-    debian|trisquel|ubuntu)
-        pi golang-go
-        # a bit of googling, and added settings to bashrc
-        go get -u github.com/mvdan/fdroidcl/cmd/fdroidcl
-        ;;
-    # others unknown
-esac
-
-
-case $distro in
-    arch)
-        # cdrkit for cloud-init isos
-        # dnsmasq & ebtables for nat networking in libvirt
-        # qemu for qemu-img, bind-tools for dig
-        # dmidecode just because syslog complains
-        pi unzip xorg-xmodmap dmidecode ebtables\
-           bridge-utils dnsmasq qemu bind-tools
-        # otherwise we get error about accessing kvm module.
-        # seems like there might be a better way, but google was a bit vague.
-        s $sed -ri '/^ *user *=/d' /etc/libvirt/qemu.conf
-        echo 'user = "root"' | s tee -a /etc/libvirt/qemu.conf
-        # https://bbs.archlinux.org/viewtopic.php?id=206206
-        # # this should prolly go in the wiki
-        sgo virtlogd.socket
-        # guessing this is not needed
-        #sgo virtlogd.service
-        sgo libvirtd
-
-        ;;
-esac
-
-case $distro in
-    arch) pi virtviewer ;;
-    *) : ;; # other distros have it as a dependency afaik.
-esac
-
-
-
-case $distro in
-    fedora) cabal install shellcheck ;;
-    *) spa shellcheck ;;
-    # unknown for older ubuntu
-esac
-
-
-case $distro in
-    arch|debian|trisquel|ubuntu) spa pumpa ;;
-    # others unknown. do have a buildscript:
-    # /a/bin/buildscripts/pumpa ;;
-esac
-
-
-case $distro in
-    debian) pi adb ;;
-    debian|trisquel|ubuntu) spa android-tools-adbd ;;
-    # todo: not sure this is needed anymore, or if trisqel etc works even
-    #    debian) spa android-tools-adbd/unstable ;;
-    arch) spa android-tools ;;
-    # other distros unknown
-esac
+m /a/bin/buildscripts/go
+m /a/bin/buildscripts/rust
+m /a/bin/buildscripts/misc
 
-
-
-case $distro in
-    fedora)
-        cd $(mktemp -d)
-        wget ftp://ftp.gnu.org/pub/gnu/global/global-6.5.7.tar.gz
-        ex global*
-        cd global-6.5.7
-        # based on https://github.com/leoliu/ggtags
-        ./configure --with-exuberant-ctags=/usr/bin/ctags
-        make
-        s make install
-        s pip install pygments
-        ;;
-    *)
-        pi global
-        ;;&
-    arch)
-        pi  python2-pygments
-        ;;
-    debian|trisquel|ubuntu)
-        pi python-pygments
-        ;;
-esac
-
-
-case $distro in
-    debian)
-        pi task-mate-desktop
-        # in settings, change scrolling to two-finger,
-        # because the default edge scroll doesn\'t work.
-        pu transmission-gtk
-        ;;
-    trisquel)
-        # mate-indicator-applet and beyond are msc things I noticed diffing a
-        # standard install with mine.
-        pi xorg lightdm mate-desktop-environment mate-desktop-environment-extras mate-indicator-applet anacron
-        ;;
-    # others unknown
-esac
-
-case $distro in
-    arch) spa apg  ;;
-    # already in debian
-esac
-
-
-
-
-
-# note this failed running at the beginning of this file,
-# because no systemd user instance was running.
-# Doing systemd --user resulted in
-# Trying to run as user instance, but $XDG_RUNTIME_DIR is not set
-
-if isdebian-testing; then
-    # as of 7/2016, has no unstable deps, and is not in testing anymore.
-    pi synergy/unstable
-else
-    pi synergy
-fi
-
-# case $distro in
-#     # ubuntu unknown. probably the same as debian, just check if the
-#     # init scripts come with the package.
-#     debian)
-#         # copied from arch, but moved to etc
-#         s dd of=/etc/systemd/user/synergys.service <<'EOF'
-# [Unit]
-# Description=Synergy Server Daemon
-# After=network.target
-
-# [Service]
-# User=%i
-# ExecStart=/usr/bin/synergys --no-daemon --config /etc/synergy.conf
-# Restart=on-failure
-
-# [Install]
-# WantedBy=multi-user.target
-# EOF
-#         s dd of=/etc/systemd/user/synergys.socket <<'EOF'
-# [Unit]
-# Conflicts=synergys@.service
-
-# [Socket]
-# ListenStream=24800
-# Accept=false
-
-# [Install]
-# WantedBy=sockets.target
-# EOF
-#         # had this fail with 'Failed to connect to bus: No such file or directory'
-#         # then when I tried it manually, it worked fine...
-#         if ! systemctl --user daemon-reload; then
-#             sleep 2
-#             echo retrying systemd user daemon reload
-#             systemctl --user daemon-reload
-#         fi
-#         ;;&
-#     *)
-#         # taken from arch wiki.
-#         s dd of=/etc/systemd/system/synergyc@.service <<'EOF'
-# [Unit]
-# Description=Synergy Client
-# After=network.target
-
-# [Service]
-# User=%i
-# ExecStart=/usr/bin/synergyc --no-daemon frodo
-# Restart=on-failure
-# # per man systemd.unit, StartLimitInterval, by default we
-# # restart more than 5 times in 10 seconds.
-# # And this param defaults too 200 miliseconds.
-# RestartSec=3s
-
-# [Install]
-# WantedBy=multi-user.target
-# EOF
-#         s systemctl daemon-reload
-#         case $HOSTNAME in
-#             x2|tp)
-#                 ser enable synergyc@iank
-#                 ser start synergyc@iank ||: # X might not be running yet
-#                 ;;
-#             frodo)
-#                 systemctl --user start synergys ||:
-#                 systemctl --user enable synergys
-#                 ;;
-#         esac
-#         ;;
-# esac
+pi-nostart virtinst virt-manager
 
 
 
+pi --no-install-recommends kdeconnect
 ### kdeconnect for gnome. started in /a/bin/distro-setup/desktop-20-autostart.sh
-pi libgtk-3-dev python3-requests-oauthlib valac cmake python-nautilus libappindicator3-dev
-cd /a/opt/indicator-kdeconnect
-mkdir -p build
-cd build
-cmake .. -DCMAKE_INSTALL_PREFIX=/usr
-make
-sudo make install
-# we can start it manually with /usr/lib/x86_64-linux-gnu/libexec/kdeconnectd
-# it seems, according to
-# /etc/xdg/autostart/kdeconnectd.desktop
-# I'm not seeing the icon, but the clipboard replication is working
+### but gnome + xmonad not working in flidas, so i disabled it
+# pi libgtk-3-dev python3-requests-oauthlib valac cmake python-nautilus libappindicator3-dev
+# cd /a/opt/indicator-kdeconnect
+# mkdir -p build
+# cd build
+# cmake .. -DCMAKE_INSTALL_PREFIX=/usr
+# make
+# sudo make install
+# # we can start it manually with /usr/lib/x86_64-linux-gnu/libexec/kdeconnectd
+# # it seems, according to
+# # /etc/xdg/autostart/kdeconnectd.desktop
+# # I'm not seeing the icon, but the clipboard replication is working
+
+
+### model 01 arduino support ###
+# https://github.com/keyboardio/Kaleidoscope/wiki/Install-Arduino-support-on-Linux
+# also built latest arduino in /a/opt/Arduino, (just cd build; ant build; ant run )
+# set arduino var in bashrc,
+# have system config file setup too.
+s adduser $USER dialout
+
+# this is for the mail command too. update-alternatives is kind of misleading
+# since at least it's main commands pretend mail does not exist.
+# bsd's mail got pulled in on some dumb dependency, i dunno how.
+s update-alternatives --set mailx /usr/bin/mail.mailutils
 
 ######### end misc packages #########
 
@@ -1522,235 +1317,128 @@ DEVICESCAN -a -o on -S on -n standby,q $sched \
 
 ########### misc stuff
 
+# make networkmanager use resolvconf instead of its own dnsmasq which
+# conflicts with the normal dnsmasq package.
+f=/etc/NetworkManager/NetworkManager.conf
+m=$(md5sum $f)
+s sed -ri '/ *\[main\]/,/^ *\[[^]]+\]/{/^\s*dns[[:space:]=]/d}' $f
+if [[ $m != $(md5sum $f) ]]; then
+  srestart NetworkManager
+fi
+
+# make my /etc/fonts/conf.d/ get used.
+# I have a new sans-serif font there because the default one
+# displays l and I as the same char, grrrrr.
+s fc-cache
+
+m /a/bin/distro-setup/mymimes
+
+
+m sgo dynamicipupdate
+
+
 # stop autopoping windows when i plug in an android phone.
 # dbus-launch makes this work within an ssh connection, otherwise you get this message,
 # with still 0 exit code.
 # dconf-WARNING **: failed to commit changes to dconf: Cannot autolaunch D-Bus without X11 $DISPLAY
-dbus-launch gsettings set org.gnome.desktop.media-handling automount-open false
+m dbus-launch gsettings set org.gnome.desktop.media-handling automount-open false
+
 
+# on grub upgrade, we get prompts unless we do this
 devs=()
-for dev in $(s btrfs fi show /boot | sed -nr 's#.*path\s+(\S+)$#\1#p'); do
-    devs+=($(devbyid $dev),)
+for dev in $(s btrfs fil show /boot | sed -nr 's#.*path\s+(\S+)$#\1#p'); do
+  devs+=("$(devbyid $dev),")
 done
 devs[-1]=${devs[-1]%,} # jonied by commas
-
-# on grub upgrade, we get prompts unless we do this
 s debconf-set-selections <<EOF
 grub-pc grub-pc/install_devices multiselect ${devs[*]}
 EOF
 
+# btrfs maintenance
+sgo btrfsmaint.timer
+sgo btrfsmaintstop.timer
 
-# the wiki backup script from ofswiki.org uses generic paths
-s lnf /p/c/machine_specific/li/mw_vars /root
-s lnf /k/backup/wiki_backup /root
-
-s cedit /etc/goaccess.conf <<'EOF' || [[ $? == 1 ]]
-# all things found from looking around the default config
-# copied existing NCSA Combined Log Format with Virtual Host, plus %L
-log-format %^:%^ %h %^[%d:%t %^] "%r" %s %b "%R" "%u" %D
-time-format %H:%M:%S
-date-format %d/%b/%Y
-log-file /var/log/apache2/access.log
-color-scheme 2
-
-# tip: copy access.log files to a stretch host directory, then run
-# jessie's goaccess is too old for some options, and it\'s
-# not easily installed from a testing.
-# goaccess --ignore-crawlers -f <(cat *) -a -o html > x.html
-EOF
+# aren't autoupdating this, but I do check on it somewhat regularly.
+m cd /a/opt/btrbk
+s make install
 
+m sgo btrbk.timer
+# note: to see when it was last run,
+# ser list-timers
 
-case $distro in
-    trisquel|ubuntu|debian)
-        # unison-gtk second, i want it to be default, not sure if that works
-        # with spa. note, I used to install from testing repo when using stable,
-        # but it shouldn't be needed since I wrote a script to handle mismatching
-        # compilers.
-        spa unison unison-gtk
-        ;;
-arch)
-    spa unison gtk2
-    ;;
-esac
 
-case $distro in
-    arch)
-        # default is alsa, doesn\'t work with with pianobar
-        s dd of=/etc/libao.conf <<'EOF'
-default_driver=pulse
+end_msg <<'EOF'
+In mate settings settings, change scrolling to two-finger,
+because the default edge scroll doesn\'t work. Originally found this in debian.
 EOF
-        ;;
-esac
-
-# note, for jessie, it depends on a higher version of btrfs-tools.
-#
-# # disabled due to my patch being in btrbk
-# case $distro in
-#     arch|debian|trisquel|ubuntu) pi btrbk ;;
-#     # others unknown
-# esac
-cd /a/opt/btrbk
-s make install
-spa pv # for progress bar when running interactively.
-
-# ian: temporarily disabled while hosts are in flux.
-# if [[ $HOSTNAME == tp ]]; then
-#     # backup/sync manually on others hosts for now.
-#     sgo btrbk.timer
-#     # note: to see when it was last run,
-#     # ser list-timers
-# fi
-
 
+# Remove dep that came in with desktop to fix associations.
+m pu transmission-gtk
 
+s gpasswd -a iank adm #needed for reading logs
 
-case $distro in
-    debian|trisquel|ubuntu) s gpasswd -a iank adm ;; #needed for reading logs
-esac
+m /a/bin/buildscripts/pithosfly
 
-# tor
-case $distro in
-    # based on
-    # https://www.torproject.org/docs/rpms.html.en
-    # https://www.torproject.org/docs/debian.html.en
-    # todo: figure out if the running service needs to be restarted upon updates
-
-
-    # todo on fedora: setup non-dev packages
-    fedora)
-        s dd of=/etc/yum.repos.d/torproject.repo <<'EOF'
-[tor]
-name=Tor experimental repo
-enabled=1
-baseurl=http://deb.torproject.org/torproject.org/rpm/tor-testing/fc/20/$basearch/
-gpgcheck=1
-gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.asc
-
-[tor-source]
-name=Tor experimental source repo
-enabled=1
-autorefresh=0
-baseurl=http://deb.torproject.org/torproject.org/rpm/tor-testing/fc/20/SRPMS
-gpgcheck=1
-gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.asc
-EOF
 
-        # to be secure, take a look at the fingerprint reported from the following install, and see if it matches from the link above:
-        # 3B9E EEB9 7B1E 827B CF0A  0D96 8AF5 653C 5AC0 01F1
-        sgo tor
-        /a/bin/buildscripts/tor-browser
-        ;;
-    ubuntu)
-        tu /etc/apt/sources.list "deb http://deb.torproject.org/torproject.org $(debian-codename) main"
-        gpg --keyserver keys.gnupg.net --recv 886DDD89
-        gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add -
-        p update
-        pi deb.torproject.org-keyring
-        pi tor
-        /a/bin/buildscripts/tor-browser
-        ;;
-    debian)
-        pi tor
-        /a/bin/buildscripts/tor-browser
-        ;;
-    arch)
-        pi tor tor-browser-en
-        sgo tor
-        ;;
-    # ubuntu unknown
-esac
+# # Based on guix manual instructions, also added code to profile.
+# # disabled since i'm not using it now.
+# pi nscd
+# if ! type -p guix >/dev/null; then
+#   cd $(mktemp -d)
+#   wget https://git.savannah.gnu.org/cgit/guix.git/plain/etc/guix-install.sh
+#   # added some stuff to envonment.sh for profile based on
+#   # manual instructions
+#   # wget https://sv.gnu.org/people/viewgpg.php?user_id=15145 -qO - | gpg --import -
+#   # echo is to get past prompt
+#   yes | sudo -E HOME=$HOME bash guix-install.sh || [[ $? == 141 ]]
+#   guix install glibc-utf8-locales
+#   guix package --install guile
+# fi
 
-# nfs server
-case $distro in
-    fedora)
-        end_msg <<'EOF'
-fedora todo: disable the firewall or find a way to automate it.
-there's an unused section in t.org for tramikssion firewall setup
-
-fedora manual config for nfs:
-s firewall-config
-change to permanent configuration
-check the box for nfs
-was hard to figure this out, not sure if this is all needed, but
-unblock these too
-mountd: udp/tcp 20048
-portmapper, in firewall-config its called rpc-bind: udp/tcp 111
-troubleshooting, unblock things in rpcinfo -p
-make sure to reload the firewall to load the persistent configuration
 
 
-EOF
-        pi nfs-utils
-        sgo nfs-server
-        ;;
-    debian|trisquel|ubuntu)
-        pi nfs-server
-        ;;
-    arch)
-        pi nfs-utils || pending_reboot=true
-        sgo rpcbind
-        # this failed until I rebooted
-        sgo nfs-server
-        ;;
-esac
+pi tor
+m /a/bin/buildscripts/tor-browser
 
+# nfs server
+pi-nostart nfs-kernel-server
 
+# networkmanager has this nasty behavior on flidas: if the machine
+# crashes with dnsmasq running, on subsequent boot, it adds an entry to
+# resolvconf for 127.0.0.1 in some stupid attempt to restore
+# nameservers.
+# This can be manually fixed by stoping dnsmasq,
+# then based on whats in /run/dnsmasq/, i see we can run
+# s resolvconf -d NetworkManager
+# oh ya, and stoping NetworkManager leaves this crap behind without cleaning it up.
+ser stop NetworkManager
+ser disable NetworkManager
 
 
 if [[ $HOSTNAME == frodo ]]; then
-    # nohide = export filesystems mounted deeper than the export point
-    # fsid=0 makes this export the "root" export
-    # not documented in the man page, but this means
-    # 1. it can be mounted with a shorthand of server:/
-    # 2. exports that are subdirectories of this one will automatically be mounted
-    tu /etc/exports <<'EOF'
-/k 192.168.1.0/24(rw,fsid=0,nohide,no_root_squash,async,no_subtree_check,insecure)
+  # nohide = export filesystems mounted deeper than the export point
+  # fsid=0 makes this export the "root" export
+  # not documented in the man page, but this means
+  # 1. it can be mounted with a shorthand of server:/
+  # 2. exports that are subdirectories of this one will automatically be mounted
+  tu /etc/exports <<'EOF'
+/k 10.0.0.0/24(rw,fsid=0,nohide,no_root_squash,async,no_subtree_check,insecure)
 EOF
-    s exportfs -rav
+  s exportfs -rav
 fi
 
 
-e "$end_msg_var"
 
 
-# persistent virtual machines
-case $distro in
-    debian|trisquel|ubuntu)
-        pi libosinfo-bin;
-        ;;
-esac
+
 # if I was going to create a persistent vm, i might do it like this:
 # variant=something  # from: virt-install --os-variant list
 # s virt-install --noautoconsole --graphics spice,listen=0.0.0.0 \
-    #   --disk=/a/images/some_name.qcow2,bus=virtio --vcpus 2 -r 4096 -w bridge=br0 \
-    #   -n some_name --import --os-variant $variant --cpu host-model-only
+  #   --disk=/a/images/some_name.qcow2,bus=virtio --vcpus 2 -r 4096 -w bridge=br0 \
+  #   -n some_name --import --os-variant $variant --cpu host-model-only
 
 
 
 ######### begin stuff belonging at the end    ##########
 
-
-# Apps we want to override others for default file handler:
-# simplest way in debian is to just install them last.
-simple_packages+=(
-    mpv
-)
-
-case $distro in
-    ubuntu|debian)
-        spa spacefm-gtk3 ;;
-    arch)
-        spa spacefm ;;
-esac
-
-
-pi "${simple_packages[@]}"
-
-
-if $pending_reboot; then
-    echo "$0: pending reboot and then finished. doing it now."
-    s reboot now
-else
-    echo "$0: $(date): ending now)"
-fi
-exit 0
+end