From fc768c2390c269de2fdc4c0b1fc0341053926244 Mon Sep 17 00:00:00 2001
From: sev <git@sev.monster>
Date: Wed, 18 Mar 2020 22:39:00 -0500
Subject: [PATCH 01/16] update submodules, cache icons when installing

---
 base/.vim/pack/commentary.vim/start/vim-commentary   | 2 +-
 base/.vim/pack/repeat.vim/start/vim-repeat           | 2 +-
 base/.vim/pack/speeddating.vim/start/vim-speeddating | 2 +-
 base/.vim/pack/surround.vim/start/vim-surround       | 2 +-
 install.sh                                           | 7 +++++--
 xorg/icons/paper-icon-theme                          | 2 +-
 6 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/base/.vim/pack/commentary.vim/start/vim-commentary b/base/.vim/pack/commentary.vim/start/vim-commentary
index 141d9d3..f8238d7 160000
--- a/base/.vim/pack/commentary.vim/start/vim-commentary
+++ b/base/.vim/pack/commentary.vim/start/vim-commentary
@@ -1 +1 @@
-Subproject commit 141d9d32a9fb58fe474fcc89cd7221eb2dd57b3a
+Subproject commit f8238d70f873969fb41bf6a6b07ca63a4c0b82b1
diff --git a/base/.vim/pack/repeat.vim/start/vim-repeat b/base/.vim/pack/repeat.vim/start/vim-repeat
index ae361be..c947ad2 160000
--- a/base/.vim/pack/repeat.vim/start/vim-repeat
+++ b/base/.vim/pack/repeat.vim/start/vim-repeat
@@ -1 +1 @@
-Subproject commit ae361bea990e27d5beade3a8d9fa22e25cec3100
+Subproject commit c947ad2b6a16983724a0153bdf7f66d7a80a32ca
diff --git a/base/.vim/pack/speeddating.vim/start/vim-speeddating b/base/.vim/pack/speeddating.vim/start/vim-speeddating
index ce2f1aa..fe98cfa 160000
--- a/base/.vim/pack/speeddating.vim/start/vim-speeddating
+++ b/base/.vim/pack/speeddating.vim/start/vim-speeddating
@@ -1 +1 @@
-Subproject commit ce2f1aae9f2be128b4ca322a8e797be3ae40c30b
+Subproject commit fe98cfaa7ea9c4b838d42a6830437c919eb55b4e
diff --git a/base/.vim/pack/surround.vim/start/vim-surround b/base/.vim/pack/surround.vim/start/vim-surround
index fab8621..f51a26d 160000
--- a/base/.vim/pack/surround.vim/start/vim-surround
+++ b/base/.vim/pack/surround.vim/start/vim-surround
@@ -1 +1 @@
-Subproject commit fab8621670f71637e9960003af28365129b1dfd0
+Subproject commit f51a26d3710629d031806305b6c8727189cd1935
diff --git a/install.sh b/install.sh
index 15b9f19..bff209a 100755
--- a/install.sh
+++ b/install.sh
@@ -58,7 +58,10 @@ find urxvt-ext -type f -perm -111 -mindepth 1 -maxdepth 2 | while read -r x; do
 done
 find xorg/icons -type d -mindepth 1 -maxdepth 2 | while read -r x; do
 	if [ -e "$x/index.theme" ]; then
-		l "$HOME/.icons/`basename "$x"`"
+		d="$HOME/.icons/`basename "$x"`"
+		l $d
+		which gtk-update-icon-cache >/dev/null 2>&1 && gtk-update-icon-cache -qtf $d
+		unset d
 	fi
 done
 find xorg/themes -type d -mindepth 1 -maxdepth 1 | while read -r x; do
@@ -68,7 +71,7 @@ find fonts -type d -mindepth 1 -maxdepth 1 | while read -r x; do
 	l "$HOME/share/fonts/`basename "$x"`"
 done
 #XXX: potential bug with newlines in profile name (if ff even takes it)
-#XXX: breaks on multiple profiles
+#XXX: breaks on multiple profiles, read from profiles.ini
 ffdir="`find "$HOME/.mozilla/firefox" -type d -mindepth 1 -maxdepth 1 | head -1 2>$devnull`"
 if [ -d "$ffdir" ]; then
 	find firefox -mindepth 1 -maxdepth 1 | while read -r x; do
diff --git a/xorg/icons/paper-icon-theme b/xorg/icons/paper-icon-theme
index ab51c46..aa3e8af 160000
--- a/xorg/icons/paper-icon-theme
+++ b/xorg/icons/paper-icon-theme
@@ -1 +1 @@
-Subproject commit ab51c46f2b562e0860eef0c2b2d673fd9811acdd
+Subproject commit aa3e8af7a1f0831a51fd7e638a4acb077a1e5188
-- 
2.48.1


From d3712462cc7b9b96633cb9ad9dc802ea0034c562 Mon Sep 17 00:00:00 2001
From: sev <git@sev.monster>
Date: Wed, 18 Mar 2020 23:22:23 -0500
Subject: [PATCH 02/16] fix .zshrc, pa, spa; rename prompt to arrows

---
 .../{prompt_ds6_setup => prompt_arrows_setup} | 22 +++++++++----------
 base/.zshrc                                   | 18 +++++++++------
 2 files changed, 22 insertions(+), 18 deletions(-)
 rename base/.zsh/{prompt_ds6_setup => prompt_arrows_setup} (84%)

diff --git a/base/.zsh/prompt_ds6_setup b/base/.zsh/prompt_arrows_setup
similarity index 84%
rename from base/.zsh/prompt_ds6_setup
rename to base/.zsh/prompt_arrows_setup
index b1f5613..517c262 100644
--- a/base/.zsh/prompt_ds6_setup
+++ b/base/.zsh/prompt_arrows_setup
@@ -1,6 +1,6 @@
-prompt_ds6_help() {
+prompt_arrows_help() {
     cat << EOF
-prompt ds6 <right|2line> <normal> <prompt> <ssh> <urgent> <comment> <dir> <unwritable>
+prompt arrows <right|2line> <normal> <prompt> <ssh> <urgent> <comment> <dir> <unwritable>
 
 The first parameter determines whether or not to use right-aligned status
 text, or to put it above the command line.
@@ -18,9 +18,9 @@ respectively.
 EOF
 }
 
-local prompt_ds6_vimode=
+local prompt_arrows_vimode=
 
-function prompt_ds6_setup() {
+function prompt_arrows_setup() {
     # TODO: check for color terminal. never will use B&W term but still a XXX
     local n p _p s r c d u
     #TODO remove n?
@@ -47,7 +47,7 @@ function prompt_ds6_setup() {
     local clock="%F{$n}%T%f" dirvcs="%F{$d}"'${vcs_info_msg_0_:-%~}'"%f"
     local battery=/sys/class/power_supply/BAT0/capacity
     [[ -e "$battery" ]] && clock+=" `cat $battery`%%"
-    local vicol='%F{${${prompt_ds6_vimode:+'"$r"'}:-'"$c"'}}'
+    local vicol='%F{${${prompt_arrows_vimode:+'"$r"'}:-'"$c"'}}'
     case "$m" {
         2line)
             PROMPT="%f    $clock $dirvcs"$'\n'"%F{$c}>>> "
@@ -69,26 +69,26 @@ function prompt_ds6_setup() {
     zstyle ':vcs_info:git*' stagedstr   "%F{$c}+"
     zstyle ':vcs_info:git*' unstagedstr "%F{$r}*"
 
-    add-zsh-hook precmd prompt_ds6_precmd
-    add-zsh-hook preexec prompt_ds6_preexec
+    add-zsh-hook precmd prompt_arrows_precmd
+    add-zsh-hook preexec prompt_arrows_preexec
     zle -N zle-line-init
     zle -A zle-line-init zle-keymap-select
 }
 
 # change color based on zle vi mode
 function zle-line-init {
-    prompt_ds6_vimode="${KEYMAP:/(main|viins)/}"
+    prompt_arrows_vimode="${KEYMAP:/(main|viins)/}"
     zle reset-prompt
 }
 
-function prompt_ds6_precmd {
+function prompt_arrows_precmd {
     # TODO: check if vcs_info is autoloaded
     vcs_info
 }
 
-function prompt_ds6_preexec {
+function prompt_arrows_preexec {
     print -Pn "%F{red}<<<%f "
 }
 
-prompt_ds6_setup "$@"
+prompt_arrows_setup "$@"
 #  vim: set et fenc=utf-8 ft=zsh sts=4 sw=4 ts=8 tw=0 :
diff --git a/base/.zshrc b/base/.zshrc
index eec9016..96f14c5 100644
--- a/base/.zshrc
+++ b/base/.zshrc
@@ -34,7 +34,7 @@ bindkey    "^[[3~" delete-char       #Del
 bindkey -a "^[[3~" delete-char
 ## history search
 autoload -Uz up-line-or-beginning-search down-line-or-beginning-search && {
-    if [[ -n "$key[Up]"   ]] {
+    if [[ -n "$key[Up]" ]] {
         zle -N up-line-or-beginning-search
         bindkey -- "$key[Up]"   up-line-or-beginning-search
     }
@@ -56,24 +56,28 @@ if [[ "$OSTYPE" =~ '^(free|net)bsd' ]] {
 }
 ## ps
 local p=
-if which pstree >/dev/null 2>&1 && ! check-busybox pstree {
+if which pstree >/dev/null 2>&1 && ! check-busybox pstree; then
     # use pstree, but NOT busybox pstree because it kinda sucks
     p="pstree -wg3"
-} elif [[ "$OSTYPE" =~ '^freebsd' ]] {
+elif [[ "$OSTYPE" =~ '^freebsd' ]]; then
     p="ps -aSdfxwwouser=USR -ogroup=GRP -opid,nice=NI \
        -o%cpu,%mem,tty,stat,start=START -oetime,command"
-} elif check-busybox ps {
+elif check-busybox ps; then
     # busybox compatible
     p="ps -eouser='USR     ' -ogroup='GRP     ' \
        -opid='  PID' -onice=' NI' -ovsz=' MEM' \
        -otty,stat,etime,comm"
-} else {
+else
     # XXX: untested, posix
     # TODO: support gnu ps
     p="ps -eouser=USR -ogroup=GRP -opid,nice=NI \
        -opcpu=CPU -ovsz=MEM -otty,stat,etime,comm"
+fi
+if [[ "$(basename "$PAGER")" = "less" ]] {
+    p="$p | less -SE"
+} else {
+    p="$p | \"${PAGER:-more}\""
 }
-p="$p | ${PAGER:-more} -Se"
 alias pa="$p"
 alias spa="sudo $p"
 unset p
@@ -205,7 +209,7 @@ compinit
 ## prompt
 # do this last so prompt can potentially override
 autoload -Uz promptinit && promptinit
-prompt ds6
+prompt arrows
 
 
 ### unset imports
-- 
2.48.1


From 3fb394c5798cb4e3e63b51f24f5912b7cf8d1623 Mon Sep 17 00:00:00 2001
From: sev <git@sev.monster>
Date: Mon, 20 Apr 2020 02:04:27 -0500
Subject: [PATCH 03/16] fix gnu find depth warning, update comments

---
 install.sh | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/install.sh b/install.sh
index bff209a..1316d74 100755
--- a/install.sh
+++ b/install.sh
@@ -53,10 +53,10 @@ done
 find xdg -mindepth 1 -maxdepth 1 | while read -r x; do
 	l "$HOME/etc/`basename "$x"`"
 done
-find urxvt-ext -type f -perm -111 -mindepth 1 -maxdepth 2 | while read -r x; do
+find urxvt-ext -mindepth 1 -maxdepth 2 -type f -perm -111 | while read -r x; do
 	l "$HOME/.urxvt/ext/`basename $x`"
 done
-find xorg/icons -type d -mindepth 1 -maxdepth 2 | while read -r x; do
+find xorg/icons -mindepth 1 -maxdepth 2 -type d | while read -r x; do
 	if [ -e "$x/index.theme" ]; then
 		d="$HOME/.icons/`basename "$x"`"
 		l $d
@@ -64,15 +64,15 @@ find xorg/icons -type d -mindepth 1 -maxdepth 2 | while read -r x; do
 		unset d
 	fi
 done
-find xorg/themes -type d -mindepth 1 -maxdepth 1 | while read -r x; do
+find xorg/themes -mindepth 1 -maxdepth 1 -type d | while read -r x; do
 	l "$HOME/.themes/`basename "$x"`"
 done
-find fonts -type d -mindepth 1 -maxdepth 1 | while read -r x; do
+find fonts -mindepth 1 -maxdepth 1 -type d | while read -r x; do
 	l "$HOME/share/fonts/`basename "$x"`"
 done
 #XXX: potential bug with newlines in profile name (if ff even takes it)
-#XXX: breaks on multiple profiles, read from profiles.ini
-ffdir="`find "$HOME/.mozilla/firefox" -type d -mindepth 1 -maxdepth 1 | head -1 2>$devnull`"
+#XXX: only uses first profile folder, read from profiles.ini
+ffdir="`find "$HOME/.mozilla/firefox" -mindepth 1 -maxdepth 1 -type d | head -1 2>$devnull`"
 if [ -d "$ffdir" ]; then
 	find firefox -mindepth 1 -maxdepth 1 | while read -r x; do
 		l "$ffdir/`basename "$x"`"
@@ -84,4 +84,5 @@ if [ -d "$ffdir" ]; then
 fi
 
 # run .zprofile to set up tmp
+# .zprofile also sources .zshenv for compatibility
 zsh ~/.zprofile
-- 
2.48.1


From c502db453fe691c9065bd1cac095c734f4b071f1 Mon Sep 17 00:00:00 2001
From: sev <git@sev.monster>
Date: Mon, 20 Apr 2020 03:19:08 -0500
Subject: [PATCH 04/16] link src/docker-abuild/dabuild -> bin/ if present

---
 install.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/install.sh b/install.sh
index 1316d74..0d51072 100755
--- a/install.sh
+++ b/install.sh
@@ -47,6 +47,11 @@ l() {
 find base -mindepth 1 -maxdepth 1 | while read -r x; do
 	l "$HOME/`basename "$x"`"
 done
+# requires existing source tree and `make dabuild`
+x="$HOME/src/docker-abuild/dabuild"
+if [ -e "$x" ]; then
+	l "$HOME/bin/`basename "$x"`" "$x"
+fi
 find bin share -mindepth 1 -maxdepth 1 | while read -r x; do
 	l "$HOME/$x"
 done
-- 
2.48.1


From 496e2ee3615fc4ceaf71a3be2c5ba3c7b8689784 Mon Sep 17 00:00:00 2001
From: sev <git@sev.monster>
Date: Mon, 27 Apr 2020 15:54:35 -0500
Subject: [PATCH 05/16] link dabuild and dabuild-admin from docker-abuild

---
 install.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/install.sh b/install.sh
index 0d51072..0fd3dc4 100755
--- a/install.sh
+++ b/install.sh
@@ -48,10 +48,12 @@ find base -mindepth 1 -maxdepth 1 | while read -r x; do
 	l "$HOME/`basename "$x"`"
 done
 # requires existing source tree and `make dabuild`
-x="$HOME/src/docker-abuild/dabuild"
-if [ -e "$x" ]; then
-	l "$HOME/bin/`basename "$x"`" "$x"
-fi
+for x in dabuild dabuild-admin; do
+	x="$HOME/src/docker-abuild/$x"
+	if [ -e "$x" ]; then
+		l "$HOME/bin/`basename "$x"`" "$x"
+	fi
+done
 find bin share -mindepth 1 -maxdepth 1 | while read -r x; do
 	l "$HOME/$x"
 done
-- 
2.48.1


From 88bfdcb22fde6bc06d825064ceed153bb0fb86ee Mon Sep 17 00:00:00 2001
From: sev <git@sev.monster>
Date: Mon, 11 May 2020 19:07:50 -0500
Subject: [PATCH 06/16] head all which, fix dmenu recursion, fix syncthing

synthing still used hardcoded BSD path, swith to dynamic searches.
always use `head -1` with which due to non-portability.
use $HOME instead of ~ to avoid non-portability.
---
 bin/dmenu                      | 2 +-
 bin/syncthing                  | 2 +-
 bin/update-tridactyl-native.sh | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/dmenu b/bin/dmenu
index 95039d4..0784cdf 100755
--- a/bin/dmenu
+++ b/bin/dmenu
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec `which -a dmenu | grep -iv ~ | head -1` -b -f -fn 'monospace-10' -nb \#110800 -nf \#93a1a1 -sb \#aa5500 -sf \#eee8d5 "$@"
+exec $(which -a dmenu | grep -v "$HOME" | head -1) -b -f -fn 'monospace-10' -nb \#110800 -nf \#93a1a1 -sb \#aa5500 -sf \#eee8d5 "$@"
diff --git a/bin/syncthing b/bin/syncthing
index 10615e1..dbebcfa 100755
--- a/bin/syncthing
+++ b/bin/syncthing
@@ -1,3 +1,3 @@
 #!/bin/sh
 umask 007
-/usr/local/bin/syncthing -logfile="$HOME/var/log/syncthing.log"
+$(which -a syncthing | grep -v "$HOME" | head -1) -logfile="$HOME/var/log/syncthing.log"
diff --git a/bin/update-tridactyl-native.sh b/bin/update-tridactyl-native.sh
index 86bc78b..5b03883 100755
--- a/bin/update-tridactyl-native.sh
+++ b/bin/update-tridactyl-native.sh
@@ -17,7 +17,7 @@ echoerr() {
 trap "echoerr 'Failed to install!'" ERR >/dev/null 2>&1 #can't trap ERR in sh
 
 # Check requirements for native messenger
-python_path=$(which python3) || python_path=""
+python_path=$(which python3 | head -1) || python_path=""
 if [ ! -x "$python_path" ]; then
     echoerr "Error: Python 3 must exist in PATH."
     echoerr "Please install it and run this script again."
-- 
2.48.1


From cbfa782ecacafe28885f3b65a0dec533ab7c3ddd Mon Sep 17 00:00:00 2001
From: sev <git@sev.monster>
Date: Mon, 11 May 2020 19:32:17 -0500
Subject: [PATCH 07/16] do not hardcode /tmp in .zprofile

---
 base/.zprofile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/base/.zprofile b/base/.zprofile
index 425a48c..aa57163 100644
--- a/base/.zprofile
+++ b/base/.zprofile
@@ -1,10 +1,11 @@
 #XXX: ensure we override /etc/profile, gets loaded after .zshenv
 source ~/.zshenv
 
-t="/tmp/home-$LOGNAME"
+t="${TMPDIR:-/tmp}/home-$LOGNAME"
 h="$HOME/tmp"
 if [[ ! -e "$t" ]] {
 	mkdir -m 700 "$t" > /dev/null 2>&1
+	#TODO: check if dir exists after mkdir
 }
 #allow opaque entries to override
 if [[ ! -e "$h" ]] {
-- 
2.48.1


From 55a16ad2f916424b81628034c8b7e981e28c6766 Mon Sep 17 00:00:00 2001
From: sev <git@sev.monster>
Date: Sat, 30 May 2020 13:45:06 -0500
Subject: [PATCH 08/16] add `se' alias, update syslinux stuff

---
 base/.zshrc               |  1 +
 root/syslinux.cfg         |  0
 root/update-extlinux.conf | 92 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 93 insertions(+)
 mode change 100755 => 100644 root/syslinux.cfg
 create mode 100644 root/update-extlinux.conf

diff --git a/base/.zshrc b/base/.zshrc
index 96f14c5..1f6e987 100644
--- a/base/.zshrc
+++ b/base/.zshrc
@@ -54,6 +54,7 @@ if [[ "$OSTYPE" =~ '^(free|net)bsd' ]] {
 } else {
     alias ll="ls -lAFh"
 }
+alias se=sudoedit
 ## ps
 local p=
 if which pstree >/dev/null 2>&1 && ! check-busybox pstree; then
diff --git a/root/syslinux.cfg b/root/syslinux.cfg
old mode 100755
new mode 100644
diff --git a/root/update-extlinux.conf b/root/update-extlinux.conf
new file mode 100644
index 0000000..9ee0e0f
--- /dev/null
+++ b/root/update-extlinux.conf
@@ -0,0 +1,92 @@
+# we are using the fact that this is a sourced sh script to take over and
+# handle updating ourselves. config is static and does not need changes.
+
+version=$version-mod
+verbose=0
+
+# replicate existing script
+everbose() {
+	if [ "$verbose" = "0" ]; then
+		return
+	fi
+
+	echo $*
+}
+
+ewarn() {
+	echo "WARNING:" $@ >&2
+}
+
+eerror() {
+	echo "ERROR:" $@ >&2
+	return 1
+}
+
+usage() {
+	echo "usage: $0 [-v|--verbose] [--warn-only]"
+}
+
+# NOTE: no-op for most options
+while [ $# -gt 0 ]; do
+	opt="$1"
+	shift
+	case "$opt" in
+	-v|--verbose)
+		verbose=1
+		;;
+	--warn-only)
+		warn_only=1
+		;;
+	--)
+		break
+		;;
+	-*)
+		usage
+		exit 1
+		;;
+	esac
+done
+
+src=/usr/share/syslinux/efi64
+boot=/boot/EFI/Boot
+everbose "Installing binaries from $src to $boot"
+cp $src/*.c32 $src/ldlinux.e64 $boot
+cp $src/syslinux.efi $boot/bootx64.efi
+
+ids=/usr/share/hwdata/pci.ids
+bootids=hdt/pci.ids
+apkargs="-q --no-progress"
+if ! apk info -e hwids-pci >/dev/null; then
+	everbose "Installing hwids-pci"
+	if apk $apkargs add hwids-pci; then
+		undo_hwids=1
+	else
+		ewarn $(cat <<EOF
+			Unable to install hwids-pci! If update-extlinux is
+			being called from syslinux hook during
+			installation/upgrade, you will need to run
+			update-extlinux after the apk database is unlocked.
+			Alternatively, install hwids-pci manually before
+			upgrading boot-related packages.
+EOF
+)
+	fi
+else
+	everbose "Upgrading hwids-pci"
+	if ! apk $apkargs upgrade hwids-pci; then
+		ewarn "Upgrade failed for hwids-pci, pci.ids may be out of date"
+	fi
+fi
+if [ ! -r "$ids" ]; then
+	ewarn "Cannot read $ids, can't update $boot/$bootids"
+else
+	everbose "Installing $ids to $boot/$bootids"
+	cp $ids $boot/$bootids
+fi
+if [ -n "$undo_hwids" ]; then
+	everbose "Deleting hwids-pci"
+	apk $apkargs del hwids-pci
+fi
+
+# exit from parent script
+exit 0
-- 
2.48.1


From 0b54922b0580182b7b141e9208a96f70322546a5 Mon Sep 17 00:00:00 2001
From: sev <git@sev.monster>
Date: Sat, 30 May 2020 14:20:44 -0500
Subject: [PATCH 09/16] update syslinux.cfg

---
 root/syslinux.cfg | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/root/syslinux.cfg b/root/syslinux.cfg
index 0a84369..e859adb 100644
--- a/root/syslinux.cfg
+++ b/root/syslinux.cfg
@@ -28,28 +28,28 @@ MENU COLOR timeout	* #ffcc6600 #ff110800 std
 MENU COLOR help		* #ff93a1a1 #ff221100 std
 MENU MSGCOLOR		  #ff93a1a1 #ff221100 std
 
-DEFAULT vanilla
-TIMEOUT 15
+DEFAULT lts
+TIMEOUT 5
 
 LABEL _linux
   MENU LABEL Linux
   MENU DISABLED
 
-LABEL vanilla
+LABEL lts
   MENU DEFAULT
   MENU LABEL ^Alpine Linux
-  LINUX /vmlinuz-vanilla
+  LINUX /vmlinuz-lts
   APPEND root=UUID=21194c25-5a0a-410e-9f82-759441a8cfd9 rw modules=sd-mod,usb-storage,ext4
-  INITRD /initramfs-vanilla
+  INITRD /initramfs-lts
   TEXT HELP
     Boot Alpine Linux in multi-user mode
   ENDTEXT
 
-LABEL single-vanilla
+LABEL single-lts
   MENU LABEL Alpine Linux (^maintenance)
   MENU PASSWD
   COM32 cmd.c32
-  APPEND vanilla single
+  APPEND lts single
   TEXT HELP
     Boot Alpine Linux in single-user (maintenance) mode
   ENDTEXT
@@ -60,15 +60,15 @@ LABEL _tools
 
 LABEL hdt
   MENU LABEL ^HDT
-  KERNEL hdt.c32
-  APPEND pciids=hdt/pci.ids
+  COM32 hdt.c32
+  APPEND pciids=hdt/pci.ids memtest=/memtest86+-5.01.bin
   TEXT HELP
     Start the Hardware Detection Tool
   ENDTEXT
 
 LABEL memtest
   MENU LABEL Mem^test86+
-  LINUX /memtest86+-5.01.bin
+  KERNEL /memtest86+-5.01.bin
   TEXT HELP
     Start Memtest86+ v5.01
   ENDTEXT
-- 
2.48.1


From 0c8cbb8216ad142f9d04a6bcff583d3b2bf6c827 Mon Sep 17 00:00:00 2001
From: sev <git@sev.monster>
Date: Mon, 8 Jun 2020 02:52:23 -0500
Subject: [PATCH 10/16] update urxvtd detection, new script `wall'

TERMINAL checks for urxvtd will now use `which' for portability.
`wall' script added that pulls from Mysplash API for random backgrounds
updated .xinitrc to use wall
---
 base/.xinitrc |  4 ++--
 bin/wall      | 10 ++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100755 bin/wall

diff --git a/base/.xinitrc b/base/.xinitrc
index 97c5c14..8862d13 100644
--- a/base/.xinitrc
+++ b/base/.xinitrc
@@ -21,7 +21,7 @@ fi
 
 # redshift, root image
 redon &
-"$HOME/.fehbg"
+wall &
 
 # Xorg settings
 xset r rate 290 26 &
@@ -50,7 +50,7 @@ xautolock -time 10 -locker "$HOME/bin/lck" &
 xbanish &
 eval `ssh-agent`
 
-if [ -z "$TERMINAL" -a \( -x /usr/bin/urxvtd -o -x /usr/local/bin/urxvtd \) ]; then
+if [ -z "$TERMINAL" -a \( -x $(which -a urxvtd | head -1) \) ]; then
 	for i in 1 2; do
 		# try to start client twice, once before checking for daemon
 		# and another after trying to start it
diff --git a/bin/wall b/bin/wall
new file mode 100755
index 0000000..ffd0628
--- /dev/null
+++ b/bin/wall
@@ -0,0 +1,10 @@
+#!/bin/sh
+wall="$HOME/var/tmp/wall.jpg"
+res=$(xdpyinfo)
+if [ $? -eq 0 ]; then
+	res=$(echo "$res" | awk '/dimensions:/{print $2}')
+else
+	echo "ERROR: $res"
+	exit 1
+fi
+wget -O "$wall" "https://source.unsplash.com/$res/?tunnel,architecture" && feh --no-fehbg --bg-fill "$wall"
-- 
2.48.1


From d85e195d08a4fc2e81c640b0f8ae6b7ec1627d9a Mon Sep 17 00:00:00 2001
From: sev <git@sev.monster>
Date: Mon, 8 Jun 2020 03:10:17 -0500
Subject: [PATCH 11/16] remove legacy FreeBSD scripts

---
 bin/xmixer       | 4 ----
 bin/yabar-i3mode | 4 ----
 2 files changed, 8 deletions(-)
 delete mode 100755 bin/xmixer
 delete mode 100755 bin/yabar-i3mode

diff --git a/bin/xmixer b/bin/xmixer
deleted file mode 100755
index ec4207b..0000000
--- a/bin/xmixer
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-(sleep 0.1; xdotool search --class --sync XMixer \
-  windowmove $(xdotool getmouselocation|awk 'BEGIN{FS=" |:"}{print $2" "$4}'))&
-xmixer
diff --git a/bin/yabar-i3mode b/bin/yabar-i3mode
deleted file mode 100755
index 93c944a..0000000
--- a/bin/yabar-i3mode
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-i3-mode | while read -r x; do
-	[ "$x" != "default" ] && echo "!Ybg0x268bd2Y!$x" || echo "$x"
-done
-- 
2.48.1


From 179626ae0a8eb3fbe813d667d6075e64ee4dc9cc Mon Sep 17 00:00:00 2001
From: sev <git@sev.monster>
Date: Mon, 8 Jun 2020 04:25:07 -0500
Subject: [PATCH 12/16] gitconfig: ff only

---
 base/.gitconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/base/.gitconfig b/base/.gitconfig
index a2804de..91550b2 100644
--- a/base/.gitconfig
+++ b/base/.gitconfig
@@ -5,3 +5,5 @@
 [alias]
 	push-all = !git remote | xargs -n1 git push
 	submodules-pull = submodule foreach git pull origin master
+[pull]
+	ff = only
-- 
2.48.1


From 87c38112c895522b08993cd30f5461ab0489924e Mon Sep 17 00:00:00 2001
From: sev <git@sev.monster>
Date: Mon, 10 Aug 2020 00:31:48 -0500
Subject: [PATCH 13/16] prompt_arrows_setup: make comment more readable

---
 base/.zsh/prompt_arrows_setup | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/base/.zsh/prompt_arrows_setup b/base/.zsh/prompt_arrows_setup
index 517c262..7dc4a90 100644
--- a/base/.zsh/prompt_arrows_setup
+++ b/base/.zsh/prompt_arrows_setup
@@ -5,12 +5,13 @@ prompt arrows <right|2line> <normal> <prompt> <ssh> <urgent> <comment> <dir> <un
 The first parameter determines whether or not to use right-aligned status
 text, or to put it above the command line.
 
+All other parameters are Zsh PROMPT_SUBST color values wrapped in '%F{}'.
+
 If 'prompt' or 'ssh' are 'random', their respective value will be
 procedurally generated using the machine hostname as a seed; if the
 machine is connected to SSH, the 'prompt' value will be replaced with
 the 'ssh' value.
 
-All other parameters are Zsh PROMPT_SUBST color values wrapped in '%F{}'.
 
 Defaults are white, green, random, red, blue, yellow, and darkyellow
 respectively.
-- 
2.48.1


From 38df7a875a9bbaf01317506123c52f7ed131a4f3 Mon Sep 17 00:00:00 2001
From: sev <git@sev.monster>
Date: Mon, 10 Aug 2020 00:34:33 -0500
Subject: [PATCH 14/16] remove firefox

---
 firefox/chrome/theme.as.css   | 110 -----------------------
 firefox/chrome/userChrome.css |  89 ------------------
 firefox/chrome/userChrome.xml |  50 -----------
 firefox/user-js-updater.sh    |  13 ---
 firefox/user-overrides.js     | 165 ----------------------------------
 5 files changed, 427 deletions(-)
 delete mode 100644 firefox/chrome/theme.as.css
 delete mode 100644 firefox/chrome/userChrome.css
 delete mode 100644 firefox/chrome/userChrome.xml
 delete mode 100755 firefox/user-js-updater.sh
 delete mode 100644 firefox/user-overrides.js

diff --git a/firefox/chrome/theme.as.css b/firefox/chrome/theme.as.css
deleted file mode 100644
index 75f6953..0000000
--- a/firefox/chrome/theme.as.css
+++ /dev/null
@@ -1,110 +0,0 @@
-/*** Dark theme ***/
-/* inspired by https://github.com/Izheil/Quantum-Nox-Firefox-Dark-Full-Theme */
-@namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-/* adjust internal vars */
-*:root {
-    /*TODO: eventually change to use lwt/chrome/-moz colors*/
-    --in-content-page-color: #ccc !important;
-    --in-content-page-background: #222 !important;
-    --in-content-text-color: #ccc !important;
-    /* --in-content-selected-text: #fff; */
-    --in-content-box-background: #444 !important;
-    --in-content-box-background-odd: #3a3a3a !important;
-    --in-content-box-background-hover: #555 !important;
-    --in-content-box-background-active: #333 !important;
-    --in-content-box-border-color: #777 !important;
-    --info-box-background-color: var(--in-content-box-background) !important;
-    --info-box-border-color: var(--in-content-box-border-color) !important;
-    /* --in-content-item-hover: rgba(0,149,221,0.25); */
-    --in-content-item-selected: -moz-cellhighlight !important;
-    /* --in-content-border-highlight: #0a84ff; */
-    /* --in-content-border-focus: #0a84ff; */
-    --in-content-border-color: #777 !important;
-    /* --in-content-category-outline-focus: 1px dotted #0a84ff; */
-    --in-content-category-text: #ccc !important;
-    --in-content-category-text-active: #c0c0c0 !important;
-    /* --in-content-category-text-selected: #0a84ff; */
-    /* --in-content-category-text-selected-active: #0060df; */
-    /* --in-content-category-background-hover: rgba(12,12,13,0.1); */
-    /* --in-content-category-background-active: rgba(12,12,13,0.15); */
-    /* --in-content-category-background-selected-hover: rgba(12,12,13,0.15); */
-    /* --in-content-category-background-selected-active: rgba(12,12,13,0.2); */
-    /* --in-content-tab-color: #424f5a; */
-    --in-content-link-color: #09f !important;
-    --in-content-link-color-hover: #0ff !important;
-    --in-content-link-color-active: #0070aa !important;
-    --in-content-link-color-visited: #0050aa !important;
-    --in-content-primary-button-background: #05a !important;
-    --in-content-primary-button-background-hover: #0040aa !important;
-    --in-content-primary-button-background-active: #002070 !important;
-    --in-content-table-background: #444 !important;
-    /* --in-content-table-border-dark-color: #d1d1d1; */
-    /* --in-content-table-header-background: #0a84ff; */
-}
-@-moz-document url(about:debugging) {
-    .addon-target-container {
-        background: var(--in-content-box-background) !important;
-    }
-}
-@-moz-document url(about:performance) {
-    #subprocess-reports td { /*no table-background??*/
-        background: var(--in-content-box-background) !important;
-    }
-}
-@-moz-document url(about:plugins), url(about:restartrequired),
-               url(about:serviceworkers), url(about:webrtc) {
-    html, body {
-        /* XXX: doesnt always apply */
-        background-color: var(--in-content-background-color) !important;
-    }
-}
-@-moz-document url(about:webrtc) {
-    .stats, .log {
-        background-color: var(--info-box-background-color) !important;
-        border-color: var(--info-box-border-color) !important;
-    }
-}
-@-moz-document url(about:preferences), url(about:addons) {
-    .info-panel, .extension-controlled {
-        background-color: var(--info-box-background-color) !important;
-        border-color: var(--info-box-border-color) !important;
-    }
-}
-
-/* Scrollbar */
-xul|page, xul|scrollbar, *:root {
-    /* scrollbar-color: rgb(210, 210, 210) rgb(46, 54, 69) !important; */
-    scrollbar-color: #05a #252525 !important;
-    scrollbar-width: none !important;
-}
-
-/* This should change the "not found" page image colors */
-#errorPageContainer:not(.button-container),
-#your-rights .rights-header,
-#lic-info .license-header {
-    filter: invert(95%) hue-rotate(200deg)
-}
-@-moz-document url(about:devtools) {
-    .left-pane {
-        filter: invert(95%) hue-rotate(200deg)
-    }
-}
-/* This fixes the inverted colors caused by the image filter */
-#errorPageContainer .button-container,
-#errorPageContainer #text-container,
-#your-rights .rights-header div,
-#lic-info .license-header div {
-    filter: invert(95%) hue-rotate(-200deg)
-}
-
-/* View source */
-@-moz-document url-prefix(view-source:) {
-    html {
-        background: #222 !important;
-        color: #ccc !important;
-    }
-    .attribute-name {color: #093 !important}
-    .start-tag, .end-tag {color: #f93 !important}
-    .attribute-value {color: #09f !important}
-}
diff --git a/firefox/chrome/userChrome.css b/firefox/chrome/userChrome.css
deleted file mode 100644
index 7bd824f..0000000
--- a/firefox/chrome/userChrome.css
+++ /dev/null
@@ -1,89 +0,0 @@
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-/*** userChrome.js ***
- * https://github.com/Sporif/firefox-quantum-userchromejs
- * Copyright (c) 2017 Haggai Nuchi
- * Available for use under the MIT License:
- * https://opensource.org/licenses/MIT
- */
-#PanelUI-menu-button {
-    -moz-binding: url("userChrome.xml#js");
-}
-
-
-/*** Settings ***/
-window {
-    --statusbar-height: 20px;
-}
-
-/*** Misc rules ***/
-/* Adjust padding from sidebar header */
-#sidebar-header {
-    padding: 0 3px !important;
-}
-
-/*** Tabs ***/
-/* Hide tab bar */
-window:not([tabsintitlebar="true"]):not([customizing])
-  /* #navigator-toolbox:not(:hover):not(:focus-within) */
-  #TabsToolbar {
-    visibility: collapse;
-}
-/* Hide tabs when in titlebar */
-window[tabsintitlebar="true"]:not([customizing])
-  /* #navigator-toolbox:not(:hover):not(:focus-within) */
-  #TabsToolbar {
-    opacity: 0;
-    pointer-events: none;
-}
-
-/*** Bottom bookmarks/personal toolbar ***/
-/* Adjust window size */
-window:not([inFullscreen="true"]) {
-    margin-bottom: calc(var(--statusbar-height) + 1px);
-}
-/* Move toolbar */
-window:not([inFullscreen="true"]) #PersonalToolbar
-{
-    position: fixed;
-    bottom: 0;
-    width: 100%;
-    height: var(--statusbar-height);
-}
-/* Move statuspanel to bar */
-/* XXX: opacity and collapse not really needed, just need to remove transitions
- * TODO: add box shadow to left of bar
- * XXX: :hover doesn't fire because pointer disabled in xul?
- */
-window:not([inFullscreen="true"]) #statuspanel:not(:hover) {
-    bottom: 0 !important;
-    offset-inline-start: auto;
-    offset-inline-end: 0;
-    margin-top: 0 !important;
-    max-width: 100% !important;
-    /* TODO: breaks it? thankfully fits as-is */
-    /* height: var(--statusbar-height) !important; */
-    opacity: 1 !important;
-}
-window:not([inFullscreen="true"]) #statuspanel-label {
-    margin: 0 !important;
-    border: none !important;
-    box-shadow: -5px 0 2px -2px var(--toolbar-bgcolor);
-}
-window:not([inFullscreen="true"]) #statuspanel[inactive] {
-    visibility: collapse;
-}
-
-/*** Tree Style Tabs */
-/* Hide sidebar with one tab */
-#sidebar-box[sidebarcommand="treestyletab_piro_sakura_ne_jp-sidebar-action"] {
-    transition: all 0.2s ease;
-}
-#main-window[titlepreface="[1] "]
-  #sidebar-box[sidebarcommand="treestyletab_piro_sakura_ne_jp-sidebar-action"]:not(:hover) {
-    z-index: 2 !important;
-    overflow: hidden;
-    min-width: 30px !important;
-    max-width: 30px !important;
-}
-
diff --git a/firefox/chrome/userChrome.xml b/firefox/chrome/userChrome.xml
deleted file mode 100644
index 0ba60ad..0000000
--- a/firefox/chrome/userChrome.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0"?>
-<!-- Copyright (c) 2017 Haggai Nuchi
-Available for use under the MIT License:
-https://opensource.org/licenses/MIT
- -->
-
-<!-- Run userChrome.js/userChrome.xul and .uc.js/.uc.xul/as.css files  -->
-<bindings xmlns="http://www.mozilla.org/xbl">
-  <binding id="js" extends="chrome://global/content/bindings/toolbarbutton.xml#menu">
-    <implementation>
-      <constructor><![CDATA[
-        if(window.userChromeJsMod) return;
-        window.userChromeJsMod = true;
-
-        var chromeFiles = FileUtils.getDir("UChrm", []).directoryEntries;
-        var xulFiles = [];
-        var sss = Cc['@mozilla.org/content/style-sheet-service;1'].getService(Ci.nsIStyleSheetService);
-
-        while(chromeFiles.hasMoreElements()) {
-          var file = chromeFiles.getNext().QueryInterface(Ci.nsIFile);
-          var fileURI = Services.io.newFileURI(file);
-
-          if(file.isFile()) {
-            if(/(^userChrome|\.uc)\.js$/i.test(file.leafName)) {
-              Services.scriptloader.loadSubScriptWithOptions(fileURI.spec, {target: window, ignoreCache: true});
-            }
-            else if(/(^userChrome|\.uc)\.xul$/i.test(file.leafName)) {
-              xulFiles.push(fileURI.spec);
-            }
-            else if(/\.as\.css$/i.test(file.leafName)) {
-              if(!sss.sheetRegistered(fileURI, sss.AGENT_SHEET))
-                sss.loadAndRegisterSheet(fileURI, sss.AGENT_SHEET);
-            }
-            else if(/^(?!(userChrome|userContent)\.css$).+\.css$/i.test(file.leafName)) {
-              if(!sss.sheetRegistered(fileURI, sss.USER_SHEET))
-                sss.loadAndRegisterSheet(fileURI, sss.USER_SHEET);
-            }
-          }
-        }
-
-        setTimeout(function loadXUL() {
-          if(xulFiles.length > 0) {
-            document.loadOverlay(xulFiles.shift(), null);
-            setTimeout(loadXUL, 5);
-          }
-        }, 0);
-      ]]></constructor>
-    </implementation>
-  </binding>
-</bindings>
diff --git a/firefox/user-js-updater.sh b/firefox/user-js-updater.sh
deleted file mode 100755
index a7390d4..0000000
--- a/firefox/user-js-updater.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-mv user.js user.js.bak >/dev/null 2>&1
-ghacksjs="https://raw.githubusercontent.com/ghacksuserjs/ghacks-user.js/master/user.js"
-if ! command -v curl >/dev/null; then
-    # Based on busybox-compatible wget
-    wget -q "$ghacksjs"
-else
-    curl -sSO "$ghacksjs"
-fi
-echo >> user.js
-cat user-overrides.js >> user.js
-echo Updated!
-diff user.js.bak user.js 2>/dev/null
diff --git a/firefox/user-overrides.js b/firefox/user-overrides.js
deleted file mode 100644
index 21fc22b..0000000
--- a/firefox/user-overrides.js
+++ /dev/null
@@ -1,165 +0,0 @@
-// Custom user.js overrides
-user_pref("_user.js.parrot", "overrides section syntax error");
-
-// 0102
-user_pref("browser.startup.page", 3);
-
-// 0105b [CUSTOM]
-user_pref("browser.newtabpage.activity-stream.asrouter.userprefs.cfr", "");
-user_pref("browser.newtabpage.activity-stream.asrouter.userprefs.cfr-fxa", "");
-user_pref("browser.newtabpage.activity-stream.default.sites", "");
-user_pref("browser.newtabpage.activity-stream.feeds.aboutpreferences", false);
-user_pref("browser.newtabpage.activity-stream.feeds.asrouterfeed", false);
-user_pref("browser.newtabpage.activity-stream.feeds.discoverystreamfeed", false);
-user_pref("browser.newtabpage.activity-stream.feeds.favicon", false);
-user_pref("browser.newtabpage.activity-stream.feeds.migration", false);
-user_pref("browser.newtabpage.activity-stream.feeds.newtabinit", false);
-user_pref("browser.newtabpage.activity-stream.feeds.places", false);
-user_pref("browser.newtabpage.activity-stream.feeds.prefs", false);
-user_pref("browser.newtabpage.activity-stream.feeds.section.highlights", false);
-user_pref("browser.newtabpage.activity-stream.feeds.section.topstories", false);
-user_pref("browser.newtabpage.activity-stream.feeds.section.topstories.options", "{}");
-user_pref("browser.newtabpage.activity-stream.feeds.section.topstories.rec.impressions", "{}");
-user_pref("browser.newtabpage.activity-stream.feeds.section.topstories.spoc.impressions", "{}");
-user_pref("browser.newtabpage.activity-stream.feeds.sections", false);
-user_pref("browser.newtabpage.activity-stream.feeds.snippets", false);
-user_pref("browser.newtabpage.activity-stream.feeds.systemtick", false);
-user_pref("browser.newtabpage.activity-stream.feeds.telemetry", false);
-user_pref("browser.newtabpage.activity-stream.feeds.theme", false);
-user_pref("browser.newtabpage.activity-stream.feeds.topsites", false);
-user_pref("browser.newtabpage.activity-stream.migrationExpired", true);
-user_pref("browser.newtabpage.activity-stream.section.highlights.includeBookmarks", false);
-user_pref("browser.newtabpage.activity-stream.section.highlights.includeDownloads", false);
-user_pref("browser.newtabpage.activity-stream.section.highlights.includePocket", false);
-user_pref("browser.newtabpage.activity-stream.section.highlights.includeVisited", false);
-user_pref("browser.newtabpage.activity-stream.section.topstories.showDisclaimer", false);
-user_pref("browser.newtabpage.activity-stream.showSearch", false);
-user_pref("browser.newtabpage.activity-stream.showSponsored", false);
-user_pref("browser.newtabpage.activity-stream.telemetry", false);
-user_pref("browser.newtabpage.activity-stream.telemetry.ping.endpoint", "data:text/plain,");
-user_pref("browser.newtabpage.activity-stream.tippyTop.service.endpoint", "data:text/plain,");
-
-// 0105d
-user_pref("browser.library.activity-stream.enabled", false);
-
-// 0515
-user_pref("extensions.screenshots.disabled", true);
-user_pref("extensions.screenshots.upload-disabled", true);
-
-// 0701
-user_pref("network.dns.disableIPv6", false);
-// 0707
-user_pref("network.trr.mode", 0);
-user_pref("network.trr.bootstrapAddress", "");
-user_pref("network.trr.uri", "");
-
-// 0901
-user_pref("signon.rememberSignons", false);
-// 0903
-user_pref("security.ask_for_password", 1);
-
-// 1001
-user_pref("browser.cache.disk.enable", true);
-user_pref("browser.cache.disk.capacity", 358400);
-// 1020
-user_pref("browser.sessionstore.max_tabs_undo", 50);
-user_pref("browser.sessionstore.max_windows_undo", 3);
-// 1021
-user_pref("browser.sessionstore.privacy_level", 0);
-
-// 1241: uMatrix
-user_pref("security.mixed_content.block_display_content", false);
-// 1261
-user_pref("security.ssl3.rsa_des_ede3_sha", false);
-// 1262
-user_pref("security.ssl3.ecdhe_ecdsa_aes_128_sha", false);
-user_pref("security.ssl3.ecdhe_rsa_aes_128_sha", false);
-// 1263
-user_pref("security.ssl3.dhe_rsa_aes_128_sha", false);
-user_pref("security.ssl3.dhe_rsa_aes_256_sha", false);
-// 1264
-user_pref("security.ssl3.rsa_aes_128_sha", false);
-user_pref("security.ssl3.rsa_aes_256_sha", false);
-
-// 1401
-user_pref("browser.display.use_document_fonts", 1);
-
-// 1406
-user_pref("layout.css.font-loading-api.enabled", true);
-
-// 1603: uMatrix
-user_pref("network.http.referer.XOriginPolicy", 0);
-
-// 2212
-user_pref("dom.popup_allowed_events", "click dblclick notificationclick");
-// 2302: uMatrix
-user_pref("dom.serviceWorkers.enabled", true);
-// 2304: uMatrix
-user_pref("dom.webnotifications.enabled", true);
-user_pref("dom.webnotifications.serviceworker.enabled", true);
-
-// 2402
-user_pref("dom.event.clipboardevents.enabled", true);
-
-// 2662
-user_pref("extensions.webextensions.restrictedDomains", "");
-
-// 2701: use extensions for cookies
-user_pref("network.cookie.cookieBehavior", 0);
-
-// 2803
-user_pref("privacy.clearOnShutdown.history", false);
-user_pref("privacy.clearOnShutdown.downloads", false);
-// 2804
-user_pref("privacy.cpd.history", false);
-user_pref("privacy.cpd.downloads", false);
-
-// 4504
-user_pref("privacy.resistFingerprinting.letterboxing", false);
-
-// 5000
-/* WELCOME & WHAT's NEW NOTICES ***/
-user_pref("browser.startup.homepage_override.mstone", "ignore");
-user_pref("startup.homepage_welcome_url", "");
-user_pref("startup.homepage_welcome_url.additional", "");
-user_pref("startup.homepage_override_url", "");
-/* WARNINGS ***/
-user_pref("full-screen-api.warning.delay", 0);
-user_pref("full-screen-api.warning.timeout", 0);
-user_pref("general.warnOnAboutConfig", false);
-user_pref("general.aboutConfig.showWarning", false);
-/* APPEARANCE ***/
-user_pref("browser.download.autohideButton", false);
-user_pref("toolkit.cosmeticAnimations.enabled", false);
-user_pref("toolkit.legacyUserProfileCustomizations.stylesheets", true);
-/* CONTENT BEHAVIOR ***/
-user_pref("layout.spellcheckDefault", 2);
-/* UX BEHAVIOR ***/
-user_pref("browser.backspace_action", 2);
-user_pref("browser.tabs.closeWindowWithLastTab", false);
-user_pref("browser.tabs.loadBookmarksInTabs", true);
-/* OTHER ***/
-user_pref("browser.bookmarks.max_backups", 2);
-user_pref("browser.newtabpage.activity-stream.asrouter.userprefs.cfr.addons", false);
-user_pref("browser.newtabpage.activity-stream.asrouter.userprefs.cfr.features", false);
-user_pref("identity.fxaccounts.enabled", false);
-user_pref("extensions.pocket.enabled", false);
-user_pref("network.manage-offline-status", false);
-user_pref("reader.parse-on-load.enabled", false);
-
-// 10000: custom
-user_pref("browser.ctrlTab.recentlyUsedOrder", false);
-user_pref("browser.altClickSave", true);
-user_pref("browser.preferences.instantApply", false);
-user_pref("browser.onboarding.enabled", false);
-user_pref("devtools.onboarding.telemetry.logged", false);
-user_pref("extensions.ui.dictionary.hidden", false);
-user_pref("extensions.ui.experiment.hidden", false);
-user_pref("extensions.ui.locale.hidden", false);
-user_pref("reader.errors.includeURLs", false);
-user_pref("font.default.x-unicode", "sans-serif");
-user_pref("font.default.x-western", "sans-serif");
-user_pref("zoom.maxPercent", 500);
-user_pref("zoom.minPercent", 10);
-
-user_pref("_user.js.parrot", "SUCCESS");
-- 
2.48.1


From fff19ac03e46cd8d30c351e90e7ec2f533e3d80f Mon Sep 17 00:00:00 2001
From: sev <git@sev.monster>
Date: Mon, 10 Aug 2020 00:51:26 -0500
Subject: [PATCH 15/16] remove firefox from installer

---
 install.sh | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/install.sh b/install.sh
index 0fd3dc4..23a1910 100755
--- a/install.sh
+++ b/install.sh
@@ -77,18 +77,6 @@ done
 find fonts -mindepth 1 -maxdepth 1 -type d | while read -r x; do
 	l "$HOME/share/fonts/`basename "$x"`"
 done
-#XXX: potential bug with newlines in profile name (if ff even takes it)
-#XXX: only uses first profile folder, read from profiles.ini
-ffdir="`find "$HOME/.mozilla/firefox" -mindepth 1 -maxdepth 1 -type d | head -1 2>$devnull`"
-if [ -d "$ffdir" ]; then
-	find firefox -mindepth 1 -maxdepth 1 | while read -r x; do
-		l "$ffdir/`basename "$x"`"
-	done
-	cd "$ffdir"
-	echo "Updating user.js"
-	sh ./user-js-updater.sh
-	cd - >$devnull
-fi
 
 # run .zprofile to set up tmp
 # .zprofile also sources .zshenv for compatibility
-- 
2.48.1


From bf314d35d59a4b7bd8af1ab13cb11bf29cf9452e Mon Sep 17 00:00:00 2001
From: sev <git@sev.monster>
Date: Thu, 8 Oct 2020 09:20:14 -0500
Subject: [PATCH 16/16] add gpg, update install.sh, fix .zshenv.local

gpg configs added and install.sh updated for them
gpg agent started under .zshenv
fixed .zshenv.local not being read
removed oboslete dabuild references from install.sh
---
 base/.zshenv       | 13 ++++++++++---
 gpg/gpg-agent.conf |  3 +++
 gpg/gpg.conf       | 43 +++++++++++++++++++++++++++++++++++++++++++
 install.sh         | 21 +++++++++++----------
 4 files changed, 67 insertions(+), 13 deletions(-)
 create mode 100644 gpg/gpg-agent.conf
 create mode 100644 gpg/gpg.conf

diff --git a/base/.zshenv b/base/.zshenv
index 1809f47..46b0e66 100644
--- a/base/.zshenv
+++ b/base/.zshenv
@@ -23,15 +23,22 @@ export XDG_RUNTIME_DIR=~/tmp
 export PYTHONSTARTUP=~/.pythonrc
 ## perl
 (( ${+commands[perl]} )) && eval $(perl -I $XDG_DATA_HOME/perl5/lib/perl5 -Mlocal::lib=$XDG_DATA_HOME/perl5)
+## gpg
+export GPG_TTY=$(tty)
+if [[ ! -v SSH_AUTH_SOCK ]] {
+	# set up SSH auth socket and start GPG agent
+	export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
+}
+gpg-connect-agent updatestartuptty /bye >/dev/null
 
 ### freebsd
-if [[ "$OSTYPE" =~ "^freebsd" ]]; then
+if [[ "$OSTYPE" =~ "^freebsd" ]] {
 	export CLICOLOR=
 	export LS_COLORS='di=34:ln=35:so=32:pi=33:ex=31:bd=46;34:cd=43;34:su=41;30:sg=46;30:tw=42;30:ow=43;30'
-fi
+}
 
 ### load site-specific
-if [[ -e "~/.zshenv.local" ]] && [[ ! -v _ZSHENV_LOADED ]] {
+if [[ -f ~/.zshenv.local ]] && [[ ! -v _ZSHENV_LOADED ]] {
 	export _ZSHENV_LOADED=
 	source ~/.zshenv.local
 }
diff --git a/gpg/gpg-agent.conf b/gpg/gpg-agent.conf
new file mode 100644
index 0000000..7b6f994
--- /dev/null
+++ b/gpg/gpg-agent.conf
@@ -0,0 +1,3 @@
+enable-ssh-support
+default-cache-ttl 0
+pinentry-program /usr/bin/pinentry-x11
diff --git a/gpg/gpg.conf b/gpg/gpg.conf
new file mode 100644
index 0000000..0b30d7a
--- /dev/null
+++ b/gpg/gpg.conf
@@ -0,0 +1,43 @@
+# cryptography preferences
+personal-cipher-preferences AES256 AES192 AES
+personal-digest-preferences SHA512 SHA384 SHA256
+personal-compress-preferences ZLIB BZIP2 ZIP Uncompressed
+default-preference-list SHA512 SHA384 SHA256 AES256 AES192 AES ZLIB BZIP2 ZIP Uncompressed
+# key signing algo
+cert-digest-algo SHA512
+# symmetric operations algos
+s2k-digest-algo SHA512
+s2k-cipher-algo AES256
+
+# general
+expert
+charset utf-8
+use-agent
+default-key 0x747327ED5BA43ED5
+trusted-key 0x747327ED5BA43ED5
+
+# visual
+no-greeting
+keyid-format 0xlong
+list-options show-uid-validity
+verify-options show-uid-validity show-keyserver-urls
+with-fingerprint
+with-keygrip
+with-key-origin
+
+# hardening
+# disable caching of passphrase for symmetrical ops
+no-symkey-cache
+# disable recipient key ID in messages
+throw-keyids
+
+# keyservers
+keyserver hkps://keys.openpgp.org
+keyserver hkps://hkps.pool.sks-keyservers.net
+keyserver hkps://pgp.ocf.berkeley.edu
+keyserver hkps://pgp.mit.edu
+keyserver hkps://keyring.debian.org
+keyserver hkps://keyserver.ubuntu.com
+keyserver hkps://attester.flowcrypt.com
+keyserver hkps://zimmermann.mayfirst.org
+keyserver-options auto-key-retrieve
diff --git a/install.sh b/install.sh
index 23a1910..25e094a 100755
--- a/install.sh
+++ b/install.sh
@@ -21,7 +21,7 @@ fi
 
 # create preferred folder structure
 cd ~
-mkdir -p bin etc share share/fonts .urxvt/ext .icons .themes >$devnull 2>&1
+mkdir -p bin etc share share/fonts .urxvt/ext .icons .themes .gnupg >$devnull 2>&1
 mkdir -pm 700 var/tmp var/tmp/vim >$devnull 2>&1
 cd - >$devnull
 
@@ -47,16 +47,12 @@ l() {
 find base -mindepth 1 -maxdepth 1 | while read -r x; do
 	l "$HOME/`basename "$x"`"
 done
-# requires existing source tree and `make dabuild`
-for x in dabuild dabuild-admin; do
-	x="$HOME/src/docker-abuild/$x"
-	if [ -e "$x" ]; then
-		l "$HOME/bin/`basename "$x"`" "$x"
-	fi
-done
 find bin share -mindepth 1 -maxdepth 1 | while read -r x; do
 	l "$HOME/$x"
 done
+find fonts -mindepth 1 -maxdepth 1 -type d | while read -r x; do
+	l "$HOME/share/fonts/`basename "$x"`"
+done
 find xdg -mindepth 1 -maxdepth 1 | while read -r x; do
 	l "$HOME/etc/`basename "$x"`"
 done
@@ -74,9 +70,14 @@ done
 find xorg/themes -mindepth 1 -maxdepth 1 -type d | while read -r x; do
 	l "$HOME/.themes/`basename "$x"`"
 done
-find fonts -mindepth 1 -maxdepth 1 -type d | while read -r x; do
-	l "$HOME/share/fonts/`basename "$x"`"
+find gpg -mindepth 1 -maxdepth 1 \! -name '*.gpg' | while read -r x; do
+	l "$HOME/.gnupg/`basename "$x"`"
 done
+if which gpg >/dev/null; then
+	find gpg -mindepth 1 -maxdepth 1 -name '*.gpg' | while read -r x; do
+		gpg --import "$x"
+	done
+fi
 
 # run .zprofile to set up tmp
 # .zprofile also sources .zshenv for compatibility
-- 
2.48.1