Add hashall function

Requires updating symlinks.

Fixes #13.

.gitignore

@@ -4,3 +4,5 @@ installed-prefs
 *~
 *.bak
 local_dotfiles
+dotfile_overlays
+!dotfile_overlays/.keep

.gitmodules

@@ -18,14 +18,7 @@
 	path = dotfiles/vim/pack/matir/start/ctrlp
 	url = https://github.com/ctrlpvim/ctrlp.vim.git
 	fetchRecurseSubmodules = true
-[submodule "dotfiles/vim/pack/matir/start/vim-go"]
-	path = dotfiles/vim/pack/matir/start/vim-go
-	url = https://github.com/fatih/vim-go.git
-	fetchRecurseSubmodules = true
 [submodule "dotfiles/tmux/tmux-logging"]
 	path = dotfiles/tmux/tmux-logging
 	url = https://github.com/tmux-plugins/tmux-logging.git
 	fetchRecurseSubmodules = true
-[submodule "dotfiles/vim/pack/matir/start/syntastic"]
-	path = dotfiles/vim/pack/matir/start/syntastic
-	url = https://github.com/vim-syntastic/syntastic.git

bin/install_tool

@@ -5,6 +5,8 @@ set -ue
 REINSTALL=0
 PACKAGES=1
 
+export GO111MODULE=on
+
 while getopts -- "-:" a ; do
   # shellcheck disable=SC2154
   case "${a}" in
@@ -31,8 +33,16 @@ done
 
 shift $((OPTIND-1))
 
+function list_tools {
+  echo "Options:" >/dev/stderr
+  awk 'BEGIN {s=0;FS=")"};/main tool selection/{s=1};/^\s+\w+)$/{if(s==1){print $1}}' "$0" | sort | while read -r opt; do
+    echo -e "\\t${opt}" >/dev/stderr
+  done
+}
+
 if [ $# -ne 1 ] ; then
   echo "Usage: ${0} <tool>" >/dev/stderr
+  list_tools
   exit 1
 fi
 TOOL=${1}
@@ -100,6 +110,18 @@ function makedest_or_die {
   makedest || die "Aborting."
 }
 
+function deb_only {
+  # Error if not on a debian or derivative
+  if ! test -f /etc/debian_version ; then
+    echo "This tool only available for debian." >&2
+    exit 1
+  fi
+}
+
+function require_pipx {
+  command -v pipx >/dev/null 2>&1 || die "Requires pipx"
+}
+
 # Begin main tool selection
 case ${TOOL} in
   john)
@@ -144,7 +166,7 @@ case ${TOOL} in
     makedest_or_die
     gbase="https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/"
     # TODO: find a way to make this version independent
-    gsdk="google-cloud-sdk-277.0.0-linux-x86_64.tar.gz"
+    gsdk="google-cloud-sdk-385.0.0-linux-x86_64.tar.gz"
     download "${gbase}${gsdk}" /tmp/gcloud.tar.gz
     tar zxf /tmp/gcloud.tar.gz --strip-components=1 -C "${DESTDIR}"
     rm /tmp/gcloud.tar.gz
@@ -152,7 +174,7 @@ case ${TOOL} in
     ;;
   android-sdk)
     # TODO: find a way to make this version independent
-    asdk="https://dl.google.com/android/repository/tools_r25.2.3-linux.zip"
+    asdk="https://dl.google.com/android/repository/platform-tools_r31.0.2-linux.zip"
     download ${asdk} /tmp/android-tools.zip
     unzip -d "${DESTDIR}" /tmp/android-tools.zip
     rm /tmp/android-tools.zip
@@ -219,10 +241,27 @@ case ${TOOL} in
          /etc/udev/rules.d/77-mm-usb-device-blacklist.rules &&
          udevadm control --reload-rules"
     ;;
+  pm3iceman)
+    install_pkgs git ca-certificates build-essential pkg-config \
+      libreadline-dev gcc-arm-none-eabi libnewlib-dev qtbase5-dev \
+      libbz2-dev libbluetooth-dev libpython3-dev libssl-dev
+    src="https://github.com/RfidResearchGroup/proxmark3.git"
+    git clone "${src}" "${DESTDIR}"
+    cd "${DESTDIR}"
+    make clean && make -sj2
+    check_sudo && sudo /bin/sh -c \
+      "cp -rf ./driver/77-pm3-usb-device-blacklist.rules \
+         /etc/udev/rules.d/77-pm3-usb-device-blacklist.rules &&
+         udevadm control --reload-rules"
+    add_bin_symlink pm3
+    ;;
   cyberchef)
     makedest
-    src=$(python3 -c 'from urllib import request; import json; print(filter(lambda x: x["name"]=="cyberchef.htm", json.load(request.urlopen("https://api.github.com/repos/gchq/CyberChef/releases/latest"))["assets"])[0]["browser_download_url"])')
+    cd "${DESTDIR}"
-    download "${src}" "${DESTDIR}/cyberchef.html"
+    src=$(python3 -c 'from urllib import request; import json; print(json.load(request.urlopen("https://api.github.com/repos/gchq/CyberChef/releases/latest"))["assets"][0]["browser_download_url"])')
+    download "${src}" "${DESTDIR}/cyberchef.zip"
+    unzip -d "${DESTDIR}" "${DESTDIR}/cyberchef.zip"
+    ln -sf CyberChef*.html "${DESTDIR}/cyberchef.html"
     ;;
   apktool)
     makedest_or_die
@@ -268,14 +307,14 @@ case ${TOOL} in
     ;;
   aflplusplus)
     install_pkgs libtool-bin libglib2.0-dev libpixman-1-dev clang clang-tools \
-      llvm
+      llvm python3-setuptools
     git clone "https://github.com/vanhauser-thc/AFLplusplus" "${DESTDIR}"
     make -C "${DESTDIR}" distrib
     ;;
   exploitdb)
     if test -d "${DESTDIR}" ; then
       echo "Already installed, updating instead..." >/dev/stderr
-      "${DESTDIR}/searchsplit" -u
+      "${DESTDIR}/searchsploit" -u
     else
       git clone --depth 1 \
         https://github.com/offensive-security/exploitdb.git \
@@ -296,6 +335,7 @@ case ${TOOL} in
     add_bin_symlink "Cura.AppImage" cura
     ;;
   rr)
+    deb_only
     ver=$(python3 -c 'from urllib import request; import json; print(json.load(request.urlopen("https://api.github.com/repos/mozilla/rr/releases/latest"))["name"])')
     echo "Latest rr is ${ver}"
     download \
@@ -343,25 +383,152 @@ EOF
     ;;
   gf)
     install_pkgs golang-go silversearcher-ag
-    go get -u github.com/tomnomnom/gf
+    go install github.com/tomnomnom/gf@latest
     mkdir -p ${HOME}/.config
+    if test -d ${HOME}/.config/gf ; then
+      git -C ${HOME}/.config/gf pull
+    else
       git clone https://github.com/Matir/gf-patterns.git ${HOME}/.config/gf
+    fi
+    ;;
+  gron)
+    go install github.com/tomnomnom/gron@latest
+    ;;
+  httprobe)
+    go install github.com/tomnomnom/httprobe@latest
     ;;
   ffuf)
-    go get -u github.com/ffuf/ffuf
+    go install github.com/ffuf/ffuf@latest
     ;;
   gobuster)
-    go get -u github.com/OJ/gobuster
+    go install github.com/OJ/gobuster@latest
     ;;
   amass)
-    go get -u github.com/OWASP/Amass/cmd/amass
+    go install github.com/OWASP/Amass/v3/...
+    ;;
+  cht.sh)
+    install_pkgs rlwrap
+    mkdir -p ${DESTDIR}
+    curl https://cht.sh/:cht.sh > ${DESTDIR}/cht.sh
+    chmod +x ${DESTDIR}/cht.sh
+    add_bin_symlink cht.sh
+    ;;
+  age)
+    go install filippo.io/age/cmd/age@latest
+    go install filippo.io/age/cmd/age-keygen@latest
+    ;;
+  docker-compose)
+    mkdir -p ${DESTDIR}
+    curl -L \
+      "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" \
+            -o "${DESTDIR}/docker-compose"
+    chmod +x "${DESTDIR}/docker-compose"
+    add_bin_symlink docker-compose
+    ;;
+  tldr)
+    require_pipx
+    pipx install tldr
+    ;;
+  blint)
+    require_pipx
+    pipx install blint
+    ;;
+  dust)
+    if ! command -v cargo >/dev/null 2>&1 ; then
+      echo "This needs cargo (for rust)!" >/dev/stderr
+      exit 1
+    fi
+    cargo install du-dust
+    ;;
+  bottom)
+    if ! command -v cargo >/dev/null 2>&1 ; then
+      echo "This needs cargo (for rust)!" >/dev/stderr
+      exit 1
+    fi
+    cargo install bottom
+    ;;
+  delta)
+    deb_only
+    if ! check_sudo ; then
+      echo "Must be able to run as sudo."
+      exit 1
+    fi
+    dpkg_url=$(curl https://api.github.com/repos/dandavison/delta/releases/latest | \
+      jq -r '.assets[] | select(.name|test(".*_amd64.deb")) | select(.name|test(".*musl.*")|not) | .browser_download_url')
+    dpkg_name="/tmp/delta_amd64.deb"
+    download "${dpkg_url}" "${dpkg_name}"
+    sudo dpkg -i "${dpkg_name}"
+    ;;
+  ropper)
+    install_pkgs python3-z3
+    pip3 install --user pyvex ropper
+    ;;
+  kubeconform)
+    go install github.com/yannh/kubeconform/cmd/kubeconform@latest
+    ;;
+  kubectx)
+    git clone https://github.com/ahmetb/kubectx.git "${DESTDIR}"
+    add_bin_symlink kubectx
+    add_bin_symlink kubens
+    COMPDIR="${HOME}/.zshrc.completions"
+    mkdir -p "${COMPDIR}"
+    ln -sf "${DESTDIR}/completion/_kubectx.zsh" "${COMPDIR}"
+    ln -sf "${DESTDIR}/completion/_kubens.zsh" "${COMPDIR}"
+    ;;
+  starship)
+    mkdir -p ${DESTDIR}
+    download \
+      "https://github.com/starship/starship/releases/latest/download/starship-x86_64-unknown-linux-musl.tar.gz" \
+      /tmp/starship.tar.gz
+    tar -C ${DESTDIR} -zxf /tmp/starship.tar.gz starship
+    add_bin_symlink starship
+    ;;
+  arduino-cli)
+    mkdir -p "${DESTDIR}"
+    download \
+      "https://downloads.arduino.cc/arduino-cli/arduino-cli_latest_Linux_64bit.tar.gz" \
+      /tmp/arduino-cli.tar.gz
+    tar -C "${DESTDIR}" -zxf /tmp/arduino-cli.tar.gz arduino-cli
+    add_bin_symlink arduino-cli
+    ;;
+  ghidra)
+    zip_url=$(curl https://api.github.com/repos/NationalSecurityAgency/ghidra/releases/latest | \
+      jq -r '.assets[] | select(.name|test(".*.zip")) | .browser_download_url')
+    download "${zip_url}" /tmp/ghidra.zip
+    unzip -d "${DESTDIR}" /tmp/ghidra.zip
+    mv ${DESTDIR}/*/* ${DESTDIR}
+    add_bin_symlink ghidraRun ghidra
+    ;;
+  doctl)
+    # TODO: other architectures
+    tar_url=$(curl https://api.github.com/repos/digitalocean/doctl/releases/latest | \
+      jq -r '.assets[] | select(.name|test(".*linux-amd64\\.tar\\.gz")) | .browser_download_url')
+    download "${tar_url}" /tmp/doctl.tar.gz
+    mkdir -p "${DESTDIR}"
+    tar -C "${DESTDIR}" -zxf /tmp/doctl.tar.gz "doctl"
+    add_bin_symlink doctl
+    ;;
+  rustup)
+    curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | \
+      sh -s -- --no-modify-path -y
+    ;;
+  igrep)
+    if ! command -v cargo >/dev/null 2>&1 ; then
+      echo "This needs cargo (for rust)!" >/dev/stderr
+      exit 1
+    fi
+    cargo install igrep
+    ;;
+  unblob)
+    require_pipx
+    pipx install unblob
+    ;;
+  fq)
+    go install github.com/wader/fq@latest
     ;;
   *)
     echo "Unknown tool: ${TOOL}" >/dev/stderr
-    echo "Options:" >/dev/stderr
+    list_tools
-    awk 'BEGIN {s=0;FS=")"};/main tool selection/{s=1};/^\s+\w+)$/{if(s==1){print $1}}' "$0" | sort | while read -r opt; do
-      echo -e "\\t${opt}" >/dev/stderr
-    done
     exit 1
     ;;
 esac

bin/setup/nerdfonts.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+
+set -ue
+
+VER="v2.2.2"
+
+FONTS=(
+  https://github.com/ryanoasis/nerd-fonts/releases/download/${VER}/DejaVuSansMono.zip
+  https://github.com/ryanoasis/nerd-fonts/releases/download/${VER}/FiraCode.zip
+  https://github.com/ryanoasis/nerd-fonts/releases/download/${VER}/FiraMono.zip
+  https://github.com/ryanoasis/nerd-fonts/releases/download/${VER}/Hack.zip
+  https://github.com/ryanoasis/nerd-fonts/releases/download/${VER}/Inconsolata.zip
+  https://github.com/ryanoasis/nerd-fonts/releases/download/${VER}/OpenDyslexic.zip
+)
+
+FPATH=${HOME}/.fonts/nerdfonts
+mkdir -p ${FPATH}
+cd ${FPATH}
+
+for f in ${FONTS[@]}; do
+  BN=$(basename $f)
+  wget -O ${FPATH}/${BN} ${f}
+  unzip -o -d ${FPATH} ${FPATH}/${BN}
+done
+
+fc-cache -v

dotfiles/Xkbmap

@@ -0,0 +1 @@
+-option ctrl:nocaps -option compose:ralt

dotfiles/aliases

@@ -53,3 +53,15 @@ alias bc="command bc -q"
 
 # Get a decently readable df
 alias dfh="df -h -x tmpfs -x devtmpfs"
+
+# Clear the GPG agent
+alias clear-gpg-agent="echo RELOADAGENT | gpg-connect-agent"
+
+# Battery details
+alias bat-details='upower -i $(upower -e | grep battery)'
+
+# Nvidia refresh rate
+alias nvidia-refresh-rate='nvidia-settings --display=:0 -q RefreshRate -t'
+
+# Earthly ssh
+alias earthly='earthly --ssh-auth-sock ""'

dotfiles/bashrc

@@ -1,5 +1,5 @@
 # Load env first
-if [ -f $HOME/.env ] ; then source $HOME/.env ; fi
+if [ -f $HOME/.shenv ] ; then source $HOME/.shenv ; fi
 
 # History settings
 HISTCONTROL=ignoredups:ignorespace

dotfiles/config/fish/fish_variables

@@ -0,0 +1,34 @@
+# This file contains fish universal variable definitions.
+# VERSION: 3.0
+SETUVAR EDITOR:vim
+SETUVAR __fish_initialized:3400
+SETUVAR fish_color_autosuggestion:586e75
+SETUVAR fish_color_cancel:\x2dr
+SETUVAR fish_color_command:93a1a1
+SETUVAR fish_color_comment:586e75
+SETUVAR fish_color_cwd:green
+SETUVAR fish_color_cwd_root:red
+SETUVAR fish_color_end:268bd2
+SETUVAR fish_color_error:dc322f
+SETUVAR fish_color_escape:00a6b2
+SETUVAR fish_color_history_current:\x2d\x2dbold
+SETUVAR fish_color_host:normal
+SETUVAR fish_color_host_remote:yellow
+SETUVAR fish_color_match:\x2d\x2dbackground\x3dbrblue
+SETUVAR fish_color_normal:normal
+SETUVAR fish_color_operator:00a6b2
+SETUVAR fish_color_param:839496
+SETUVAR fish_color_quote:657b83
+SETUVAR fish_color_redirection:6c71c4
+SETUVAR fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dblack
+SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack
+SETUVAR fish_color_status:red
+SETUVAR fish_color_user:brgreen
+SETUVAR fish_color_valid_path:\x2d\x2dunderline
+SETUVAR fish_greeting:Welcome\x20to\x20fish\x2c\x20the\x20friendly\x20interactive\x20shell\x0aType\x20\x60help\x60\x20for\x20instructions\x20on\x20how\x20to\x20use\x20fish
+SETUVAR fish_key_bindings:fish_default_key_bindings
+SETUVAR fish_pager_color_completion:B3A06D
+SETUVAR fish_pager_color_description:B3A06D
+SETUVAR fish_pager_color_prefix:cyan\x1e\x2d\x2dunderline
+SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
+SETUVAR fish_pager_color_selected_background:\x2dr

dotfiles/config/gh/config.yml

@@ -0,0 +1,11 @@
+# What protocol to use when performing git operations. Supported values: ssh, https
+git_protocol: https
+# What editor gh should run when creating issues, pull requests, etc. If blank, will refer to environment.
+editor: !!null vim
+# When to interactively prompt. This is a global config that cannot be overridden by hostname. Supported values: enabled, disabled
+prompt: enabled
+# A pager program to send command output to, e.g. "less". Set the value to "cat" to disable the pager.
+pager: !!null less -R
+# Aliases allow you to create nicknames for gh commands
+aliases:
+    co: pr checkout

dotfiles/config/htop/htoprc

@@ -1,16 +1,17 @@
 # Beware! This file is rewritten by htop when settings are changed in the interface.
 # The parser is also very primitive, and not human-friendly.
+htop_version=3.2.2
+config_reader_min_version=3
 fields=0 48 17 18 38 39 40 2 46 47 49 1
-sort_key=46
-sort_direction=-1
-tree_sort_key=0
-tree_sort_direction=1
 hide_kernel_threads=1
 hide_userland_threads=1
+hide_running_in_container=0
 shadow_other_users=0
 show_thread_names=0
 show_program_path=1
 highlight_base_name=0
+highlight_deleted_exe=1
+shadow_distribution_path_prefix=0
 highlight_megabytes=1
 highlight_threads=1
 highlight_changes=0
@@ -18,9 +19,8 @@ highlight_changes_delay_secs=5
 find_comm_in_cmdline=1
 strip_exe_from_cmdline=1
 show_merged_command=0
-tree_view=0
-tree_view_always_by_pid=0
 header_margin=1
+screen_tabs=0
 detailed_cpu_time=0
 cpu_count_from_one=1
 show_cpu_usage=1
@@ -32,8 +32,32 @@ account_guest_in_cpu_meter=0
 color_scheme=6
 enable_mouse=1
 delay=15
-left_meters=AllCPUs Memory Swap
-left_meter_modes=1 1 1
-right_meters=Tasks LoadAverage Uptime
-right_meter_modes=2 2 2
 hide_function_bar=0
+header_layout=two_50_50
+column_meters_0=AllCPUs Memory Swap
+column_meter_modes_0=1 1 1
+column_meters_1=Tasks LoadAverage Uptime
+column_meter_modes_1=2 2 2
+tree_view=0
+sort_key=46
+tree_sort_key=0
+sort_direction=-1
+tree_sort_direction=1
+tree_view_always_by_pid=0
+all_branches_collapsed=0
+screen:Main=PID USER PRIORITY NICE M_VIRT M_RESIDENT M_SHARE STATE PERCENT_CPU PERCENT_MEM TIME Command
+.sort_key=PERCENT_CPU
+.tree_sort_key=PID
+.tree_view=0
+.tree_view_always_by_pid=0
+.sort_direction=-1
+.tree_sort_direction=1
+.all_branches_collapsed=0
+screen:I/O=PID USER IO_PRIORITY IO_RATE IO_READ_RATE IO_WRITE_RATE PERCENT_SWAP_DELAY PERCENT_IO_DELAY Command
+.sort_key=IO_RATE
+.tree_sort_key=PID
+.tree_view=0
+.tree_view_always_by_pid=0
+.sort_direction=-1
+.tree_sort_direction=1
+.all_branches_collapsed=0

dotfiles/config/i3/config

@@ -87,6 +87,10 @@ bindsym $mod+Shift+8 move container to workspace 8
 bindsym $mod+Shift+9 move container to workspace 9
 bindsym $mod+Shift+0 move container to workspace 10
 
+# do some scratchpad
+bindsym $mod+Shift+minus  move scratchpad
+bindsym $mod+minus        scratchpad show
+
 # Move workspaces between monitors
 bindsym $mod+Shift+greater move workspace to output right
 bindsym $mod+Shift+less move workspace to output left

dotfiles/config/nvim/init.vim

@@ -0,0 +1,4 @@
+" nvim config
+set runtimepath^=~/.vim runtimepath+=~/.vim/after
+let &packpath = &runtimepath
+source ~/.vimrc

dotfiles/config/starship.toml

@@ -0,0 +1,19 @@
+"$schema" = 'https://starship.rs/config-schema.json'
+
+[directory]
+fish_style_pwd_dir_length = 1
+
+[gcloud]
+# This is just too noisy
+disabled = true
+symbol = "️🇬️ "
+
+[status]
+disabled = false
+symbol = "⛌"
+
+[username]
+show_always = true
+
+[ruby]
+detect_variables = []

dotfiles/config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml

@@ -0,0 +1,195 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="xfce4-keyboard-shortcuts" version="1.0">
+  <property name="commands" type="empty">
+    <property name="default" type="empty">
+      <property name="&lt;Alt&gt;F1" type="empty"/>
+      <property name="&lt;Alt&gt;F2" type="empty">
+        <property name="startup-notify" type="empty"/>
+      </property>
+      <property name="&lt;Alt&gt;F3" type="empty">
+        <property name="startup-notify" type="empty"/>
+      </property>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;Delete" type="empty"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;l" type="empty"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;t" type="empty"/>
+      <property name="XF86Display" type="empty"/>
+      <property name="&lt;Super&gt;p" type="empty"/>
+      <property name="&lt;Primary&gt;Escape" type="empty"/>
+      <property name="XF86WWW" type="empty"/>
+      <property name="HomePage" type="empty"/>
+      <property name="XF86Mail" type="empty"/>
+      <property name="Print" type="empty"/>
+      <property name="&lt;Alt&gt;Print" type="empty"/>
+      <property name="&lt;Shift&gt;Print" type="empty"/>
+      <property name="&lt;Super&gt;e" type="empty"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;f" type="empty"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;Escape" type="empty"/>
+      <property name="&lt;Primary&gt;&lt;Shift&gt;Escape" type="empty"/>
+      <property name="&lt;Super&gt;r" type="empty">
+        <property name="startup-notify" type="empty"/>
+      </property>
+      <property name="&lt;Alt&gt;&lt;Super&gt;s" type="empty"/>
+    </property>
+    <property name="custom" type="empty">
+      <property name="&lt;Alt&gt;F2" type="string" value="xfce4-appfinder --collapsed">
+        <property name="startup-notify" type="bool" value="true"/>
+      </property>
+      <property name="&lt;Super&gt;r" type="string" value="xfce4-appfinder -c">
+        <property name="startup-notify" type="bool" value="true"/>
+      </property>
+      <property name="XF86WWW" type="string" value="exo-open --launch WebBrowser"/>
+      <property name="XF86Mail" type="string" value="exo-open --launch MailReader"/>
+      <property name="&lt;Alt&gt;F3" type="string" value="xfce4-appfinder">
+        <property name="startup-notify" type="bool" value="true"/>
+      </property>
+      <property name="&lt;Primary&gt;Escape" type="string" value="xfdesktop --menu"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;Delete" type="string" value="xfce4-session-logout"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;t" type="string" value="exo-open --launch TerminalEmulator"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;f" type="string" value="thunar"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;l" type="string" value="xflock4"/>
+      <property name="&lt;Alt&gt;F1" type="string" value="xfce4-popup-applicationsmenu"/>
+      <property name="&lt;Super&gt;p" type="string" value="xfce4-display-settings --minimal"/>
+      <property name="&lt;Primary&gt;&lt;Shift&gt;Escape" type="string" value="xfce4-taskmanager"/>
+      <property name="&lt;Super&gt;e" type="string" value="thunar"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;Escape" type="string" value="xkill"/>
+      <property name="HomePage" type="string" value="exo-open --launch WebBrowser"/>
+      <property name="XF86Display" type="string" value="xfce4-display-settings --minimal"/>
+      <property name="override" type="bool" value="true"/>
+      <property name="&lt;Super&gt;l" type="string" value="xflock4"/>
+      <property name="Print" type="string" value="flameshot gui"/>
+      <property name="&lt;Shift&gt;Print" type="string" value="flameshot full"/>
+    </property>
+  </property>
+  <property name="xfwm4" type="empty">
+    <property name="default" type="empty">
+      <property name="&lt;Alt&gt;Insert" type="empty"/>
+      <property name="Escape" type="empty"/>
+      <property name="Left" type="empty"/>
+      <property name="Right" type="empty"/>
+      <property name="Up" type="empty"/>
+      <property name="Down" type="empty"/>
+      <property name="&lt;Alt&gt;Tab" type="empty"/>
+      <property name="&lt;Alt&gt;&lt;Shift&gt;Tab" type="empty"/>
+      <property name="&lt;Alt&gt;Delete" type="empty"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;Down" type="empty"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;Left" type="empty"/>
+      <property name="&lt;Shift&gt;&lt;Alt&gt;Page_Down" type="empty"/>
+      <property name="&lt;Alt&gt;F4" type="empty"/>
+      <property name="&lt;Alt&gt;F6" type="empty"/>
+      <property name="&lt;Alt&gt;F7" type="empty"/>
+      <property name="&lt;Alt&gt;F8" type="empty"/>
+      <property name="&lt;Alt&gt;F9" type="empty"/>
+      <property name="&lt;Alt&gt;F10" type="empty"/>
+      <property name="&lt;Alt&gt;F11" type="empty"/>
+      <property name="&lt;Alt&gt;F12" type="empty"/>
+      <property name="&lt;Primary&gt;&lt;Shift&gt;&lt;Alt&gt;Left" type="empty"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;End" type="empty"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;Home" type="empty"/>
+      <property name="&lt;Primary&gt;&lt;Shift&gt;&lt;Alt&gt;Right" type="empty"/>
+      <property name="&lt;Primary&gt;&lt;Shift&gt;&lt;Alt&gt;Up" type="empty"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_1" type="empty"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_2" type="empty"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_3" type="empty"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_4" type="empty"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_5" type="empty"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_6" type="empty"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_7" type="empty"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_8" type="empty"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_9" type="empty"/>
+      <property name="&lt;Alt&gt;space" type="empty"/>
+      <property name="&lt;Shift&gt;&lt;Alt&gt;Page_Up" type="empty"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;Right" type="empty"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;d" type="empty"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;Up" type="empty"/>
+      <property name="&lt;Super&gt;Tab" type="empty"/>
+      <property name="&lt;Primary&gt;F1" type="empty"/>
+      <property name="&lt;Primary&gt;F2" type="empty"/>
+      <property name="&lt;Primary&gt;F3" type="empty"/>
+      <property name="&lt;Primary&gt;F4" type="empty"/>
+      <property name="&lt;Primary&gt;F5" type="empty"/>
+      <property name="&lt;Primary&gt;F6" type="empty"/>
+      <property name="&lt;Primary&gt;F7" type="empty"/>
+      <property name="&lt;Primary&gt;F8" type="empty"/>
+      <property name="&lt;Primary&gt;F9" type="empty"/>
+      <property name="&lt;Primary&gt;F10" type="empty"/>
+      <property name="&lt;Primary&gt;F11" type="empty"/>
+      <property name="&lt;Primary&gt;F12" type="empty"/>
+      <property name="&lt;Super&gt;KP_Left" type="empty"/>
+      <property name="&lt;Super&gt;KP_Right" type="empty"/>
+      <property name="&lt;Super&gt;KP_Down" type="empty"/>
+      <property name="&lt;Super&gt;KP_Up" type="empty"/>
+      <property name="&lt;Super&gt;KP_Page_Up" type="empty"/>
+      <property name="&lt;Super&gt;KP_Home" type="empty"/>
+      <property name="&lt;Super&gt;KP_End" type="empty"/>
+      <property name="&lt;Super&gt;KP_Next" type="empty"/>
+    </property>
+    <property name="custom" type="empty">
+      <property name="&lt;Primary&gt;F12" type="string" value="workspace_12_key"/>
+      <property name="&lt;Alt&gt;F4" type="string" value="close_window_key"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_3" type="string" value="move_window_workspace_3_key"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;Down" type="string" value="down_workspace_key"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_9" type="string" value="move_window_workspace_9_key"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;End" type="string" value="move_window_next_workspace_key"/>
+      <property name="&lt;Primary&gt;&lt;Shift&gt;&lt;Alt&gt;Left" type="string" value="move_window_left_key"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_4" type="string" value="move_window_workspace_4_key"/>
+      <property name="Right" type="string" value="right_key"/>
+      <property name="Down" type="string" value="down_key"/>
+      <property name="&lt;Shift&gt;&lt;Alt&gt;Page_Down" type="string" value="lower_window_key"/>
+      <property name="&lt;Alt&gt;Tab" type="string" value="cycle_windows_key"/>
+      <property name="&lt;Primary&gt;&lt;Shift&gt;&lt;Alt&gt;Right" type="string" value="move_window_right_key"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;Right" type="string" value="right_workspace_key"/>
+      <property name="&lt;Alt&gt;F6" type="string" value="stick_window_key"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_5" type="string" value="move_window_workspace_5_key"/>
+      <property name="&lt;Primary&gt;F11" type="string" value="workspace_11_key"/>
+      <property name="&lt;Alt&gt;F10" type="string" value="maximize_window_key"/>
+      <property name="&lt;Alt&gt;Delete" type="string" value="del_workspace_key"/>
+      <property name="&lt;Super&gt;Tab" type="string" value="switch_window_key"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;d" type="string" value="show_desktop_key"/>
+      <property name="&lt;Super&gt;KP_Page_Up" type="string" value="tile_up_right_key"/>
+      <property name="&lt;Alt&gt;F7" type="string" value="move_window_key"/>
+      <property name="Up" type="string" value="up_key"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_6" type="string" value="move_window_workspace_6_key"/>
+      <property name="&lt;Alt&gt;F11" type="string" value="fullscreen_key"/>
+      <property name="&lt;Alt&gt;space" type="string" value="popup_menu_key"/>
+      <property name="&lt;Super&gt;KP_Home" type="string" value="tile_up_left_key"/>
+      <property name="Escape" type="string" value="cancel_key"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_1" type="string" value="move_window_workspace_1_key"/>
+      <property name="&lt;Shift&gt;&lt;Alt&gt;Page_Up" type="string" value="raise_window_key"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;Home" type="string" value="move_window_prev_workspace_key"/>
+      <property name="&lt;Alt&gt;&lt;Shift&gt;Tab" type="string" value="cycle_reverse_windows_key"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;Left" type="string" value="left_workspace_key"/>
+      <property name="&lt;Alt&gt;F12" type="string" value="above_key"/>
+      <property name="&lt;Primary&gt;&lt;Shift&gt;&lt;Alt&gt;Up" type="string" value="move_window_up_key"/>
+      <property name="&lt;Alt&gt;F8" type="string" value="resize_window_key"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_7" type="string" value="move_window_workspace_7_key"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_2" type="string" value="move_window_workspace_2_key"/>
+      <property name="&lt;Super&gt;KP_End" type="string" value="tile_down_left_key"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;Up" type="string" value="up_workspace_key"/>
+      <property name="&lt;Alt&gt;F9" type="string" value="hide_window_key"/>
+      <property name="Left" type="string" value="left_key"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_8" type="string" value="move_window_workspace_8_key"/>
+      <property name="&lt;Alt&gt;Insert" type="string" value="add_workspace_key"/>
+      <property name="override" type="bool" value="true"/>
+      <property name="&lt;Super&gt;1" type="string" value="workspace_1_key"/>
+      <property name="&lt;Super&gt;2" type="string" value="workspace_2_key"/>
+      <property name="&lt;Super&gt;3" type="string" value="workspace_3_key"/>
+      <property name="&lt;Super&gt;4" type="string" value="workspace_4_key"/>
+      <property name="&lt;Super&gt;5" type="string" value="workspace_5_key"/>
+      <property name="&lt;Super&gt;6" type="string" value="workspace_6_key"/>
+      <property name="&lt;Super&gt;7" type="string" value="workspace_7_key"/>
+      <property name="&lt;Super&gt;8" type="string" value="workspace_8_key"/>
+      <property name="&lt;Super&gt;9" type="string" value="workspace_9_key"/>
+      <property name="&lt;Super&gt;0" type="string" value="workspace_10_key"/>
+      <property name="&lt;Super&gt;Left" type="string" value="tile_left_key"/>
+      <property name="&lt;Super&gt;Right" type="string" value="tile_right_key"/>
+      <property name="&lt;Super&gt;Up" type="string" value="tile_down_key"/>
+      <property name="&lt;Super&gt;Down" type="string" value="tile_up_key"/>
+      <property name="&lt;Super&gt;Page_Down" type="string" value="tile_down_right_key"/>
+    </property>
+  </property>
+  <property name="providers" type="array">
+    <value type="string" value="xfwm4"/>
+    <value type="string" value="commands"/>
+  </property>
+</channel>

dotfiles/config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml

@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="xfwm4" version="1.0">
+  <property name="general" type="empty">
+    <property name="activate_action" type="string" value="switch"/>
+    <property name="borderless_maximize" type="bool" value="true"/>
+    <property name="box_move" type="bool" value="false"/>
+    <property name="box_resize" type="bool" value="false"/>
+    <property name="button_layout" type="string" value="O|SHMC"/>
+    <property name="button_offset" type="int" value="0"/>
+    <property name="button_spacing" type="int" value="0"/>
+    <property name="click_to_focus" type="bool" value="false"/>
+    <property name="cycle_apps_only" type="bool" value="false"/>
+    <property name="cycle_draw_frame" type="bool" value="true"/>
+    <property name="cycle_raise" type="bool" value="false"/>
+    <property name="cycle_hidden" type="bool" value="true"/>
+    <property name="cycle_minimum" type="bool" value="true"/>
+    <property name="cycle_minimized" type="bool" value="false"/>
+    <property name="cycle_preview" type="bool" value="true"/>
+    <property name="cycle_tabwin_mode" type="int" value="0"/>
+    <property name="cycle_workspaces" type="bool" value="false"/>
+    <property name="double_click_action" type="string" value="maximize"/>
+    <property name="double_click_distance" type="int" value="5"/>
+    <property name="double_click_time" type="int" value="250"/>
+    <property name="easy_click" type="string" value="Alt"/>
+    <property name="focus_delay" type="int" value="316"/>
+    <property name="focus_hint" type="bool" value="true"/>
+    <property name="focus_new" type="bool" value="true"/>
+    <property name="frame_opacity" type="int" value="100"/>
+    <property name="frame_border_top" type="int" value="0"/>
+    <property name="full_width_title" type="bool" value="true"/>
+    <property name="horiz_scroll_opacity" type="bool" value="false"/>
+    <property name="inactive_opacity" type="int" value="100"/>
+    <property name="maximized_offset" type="int" value="0"/>
+    <property name="mousewheel_rollup" type="bool" value="true"/>
+    <property name="move_opacity" type="int" value="100"/>
+    <property name="placement_mode" type="string" value="center"/>
+    <property name="placement_ratio" type="int" value="20"/>
+    <property name="popup_opacity" type="int" value="100"/>
+    <property name="prevent_focus_stealing" type="bool" value="false"/>
+    <property name="raise_delay" type="int" value="250"/>
+    <property name="raise_on_click" type="bool" value="true"/>
+    <property name="raise_on_focus" type="bool" value="false"/>
+    <property name="raise_with_any_button" type="bool" value="true"/>
+    <property name="repeat_urgent_blink" type="bool" value="false"/>
+    <property name="resize_opacity" type="int" value="100"/>
+    <property name="scroll_workspaces" type="bool" value="true"/>
+    <property name="shadow_delta_height" type="int" value="0"/>
+    <property name="shadow_delta_width" type="int" value="0"/>
+    <property name="shadow_delta_x" type="int" value="0"/>
+    <property name="shadow_delta_y" type="int" value="-3"/>
+    <property name="shadow_opacity" type="int" value="50"/>
+    <property name="show_app_icon" type="bool" value="false"/>
+    <property name="show_dock_shadow" type="bool" value="true"/>
+    <property name="show_frame_shadow" type="bool" value="true"/>
+    <property name="show_popup_shadow" type="bool" value="false"/>
+    <property name="snap_resist" type="bool" value="false"/>
+    <property name="snap_to_border" type="bool" value="true"/>
+    <property name="snap_to_windows" type="bool" value="false"/>
+    <property name="snap_width" type="int" value="10"/>
+    <property name="vblank_mode" type="string" value="auto"/>
+    <property name="theme" type="string" value="Default"/>
+    <property name="tile_on_move" type="bool" value="true"/>
+    <property name="title_alignment" type="string" value="center"/>
+    <property name="title_font" type="string" value="Sans Bold 9"/>
+    <property name="title_horizontal_offset" type="int" value="0"/>
+    <property name="titleless_maximize" type="bool" value="false"/>
+    <property name="title_shadow_active" type="string" value="false"/>
+    <property name="title_shadow_inactive" type="string" value="false"/>
+    <property name="title_vertical_offset_active" type="int" value="0"/>
+    <property name="title_vertical_offset_inactive" type="int" value="0"/>
+    <property name="toggle_workspaces" type="bool" value="false"/>
+    <property name="unredirect_overlays" type="bool" value="true"/>
+    <property name="urgent_blink" type="bool" value="false"/>
+    <property name="use_compositing" type="bool" value="true"/>
+    <property name="workspace_count" type="int" value="6"/>
+    <property name="wrap_cycle" type="bool" value="true"/>
+    <property name="wrap_layout" type="bool" value="true"/>
+    <property name="wrap_resistance" type="int" value="10"/>
+    <property name="wrap_windows" type="bool" value="false"/>
+    <property name="wrap_workspaces" type="bool" value="false"/>
+    <property name="zoom_desktop" type="bool" value="true"/>
+    <property name="zoom_pointer" type="bool" value="true"/>
+    <property name="workspace_names" type="array">
+      <value type="string" value="Workspace 1"/>
+      <value type="string" value="Workspace 2"/>
+      <value type="string" value="Workspace 3"/>
+      <value type="string" value="Workspace 4"/>
+      <value type="string" value="Workspace 5"/>
+      <value type="string" value="Workspace 6"/>
+    </property>
+  </property>
+</channel>

dotfiles/gitconfig

@@ -6,6 +6,7 @@
   excludesfile = ~/.gitignore
   editor = vim
   whitespace = trailing-space,space-before-tab
+  pager = command -v delta >/dev/null 2>&1 && delta || less -eFiJM~ -j3
 
 [color]
   diff = auto
@@ -13,6 +14,7 @@
 
 [diff]
   tool = vimdiff
+  colorMoved = default
 
 [difftool]
   prompt = false
@@ -41,7 +43,7 @@
   user = matir
 
 # Site specific config
-[url "https://github.com./"]
+[url "https://github.com/"]
   insteadOf = "github:"
   insteadOf = "github://"
 
@@ -58,16 +60,29 @@
 
 [credential]
 	helper = cache --timeout=36000
+
 [receive]
 	denyCurrentBranch = updateInstead
+
 [merge]
 	tool = vimdiff
 	conflictstyle = diff3
+
 [mergetool]
 	prompt = false
+
 [include]
 	path = ~/.gitconfig.local
+
 [pull]
 	rebase = false
+
 [init]
 	defaultBranch = main
+
+[interactive]
+	diffFilter = command -v delta >/dev/null 2>&1 && delta || cat
+
+[delta]
+  navigate = true
+  line-numbers = true

dotfiles/gitignore

@@ -17,6 +17,13 @@ Thumbs.db
 # Try to avoid accidentally checking in private keys
 id_rsa
 id_ecdsa
+id_ed25519
 
 # Kicad backup files
 *.kicad_pcb-bak
+
+# Mypy cache path
+.mypy_cache
+
+# These files should basically never be committed
+.env

dotfiles/gnupg/gpg.conf

@@ -1,6 +1,6 @@
 use-agent
 # HKPS requires gnupg-curl for gpg1
-keyserver hkps://keys.openpgp.org
+keyserver hkps://keyserver.ubuntu.com
 keyserver-options auto-key-retrieve no-honor-keyserver-url
 auto-key-locate keyserver
 personal-digest-preferences SHA256

dotfiles/profile

@@ -4,7 +4,7 @@
 # Should only use POSIX constructs.
 
 # Always load ENV
-test -f "$HOME/.env" && . "$HOME/.env"
+test -f "$HOME/.shenv" && . "$HOME/.shenv"
 
 # Setup GREP_COLORS
 export GREP_COLOR='01;31'
@@ -26,4 +26,17 @@ if [ "$(uname)" = "Darwin" ] ; then
   export CLICOLOR
 fi
 
+# Setup for libvirt
+if [ -z "${LIBVIRT_DEFAULT_URI}" ] ; then
+  if [ "$(id -u)" = "0" ] || (id -g -n | grep -q "\blibvirt\b") ; then
+    LIBVIRT_DEFAULT_URI="qemu:///system"
+    export LIBVIRT_DEFAULT_URI
+  fi
+fi
+
+# Got rust? (gvim, etc.)
+if test -d "${HOME}/.cargo/bin" ; then
+  PATH="${PATH}:${HOME}/.cargo/bin"
+fi
+
 test -f "${HOME}/.profile.local" && . "${HOME}/.profile.local"

dotfiles/rsync_ignore

@@ -2,26 +2,44 @@
 .Genymobile
 .Ticket to Ride*
 .android*
+.ansible
 .arduino*
+.aws
 .bundle
 .cache
+.cargo
+.config/discord
+.config/gcloud/logs
+.config/google-chrome
+.config/google-chrome-beta
+.config/unity3d/cache
 .dropbox-dist
+.gnupg.bak
 .gradle
 .histfile
+.kube/cache
+.local/lib
 .local/share/Steam
 .local/share/Trash
-.local/lib
+.m2
+.minikube
+.npm
+.p2
+.platformio
+.rustup
 .rvm*
 .sliver
 .sqlite_history
 .thumbnails
+.virtualenvs
 .wine
+.xsession-errors*
 .zcompdump
 .zcompdump*
 Audits
 Downloads
 SpiderOak Hive
+Unity
 VirtualBox VMs
 tmp
 tools
-.minikube

dotfiles/shenv

@@ -5,8 +5,8 @@ umask 027
 
 # Paths and preferences
 export PYTHONPATH="$HOME/.python:$PYTHONPATH"
-export GOPATH="$HOME/Projects/Go:/usr/share/gocode"
+export GOPATH="$HOME/go:$HOME/Projects/Go:/usr/share/gocode"
-export PATH="$HOME/bin:$HOME/bin/tools:/sbin:/usr/sbin:$PATH:$HOME/Projects/Go/bin"
+export PATH="$HOME/bin:$HOME/bin/tools:/sbin:/usr/sbin:$PATH:$HOME/go/bin"
 export VISUAL=vim
 export EDITOR=vim
 export DEBEMAIL="david@systemoverlord.com"
@@ -34,6 +34,7 @@ if [ -z "${BROWSER}" ] ; then
   for t in google-chrome-beta google-chrome firefox ; do
     if BROWSER=$(command -v ${t}); then
       export BROWSER
+      break
     fi
   done
 fi
@@ -46,7 +47,7 @@ export GPG_ID=7FD58D9A196DCEEEAD671F94F4D7A7915DEA789B
 
 # Setup locale
 if test -x /usr/bin/locale ; then
-  for l in en_US.utf8 en_US.UTF-8 C.UTF-8 C ; do
+  for l in en_US.utf8 en_US.UTF-8 C.UTF-8 C.utf8 C ; do
     if /usr/bin/locale -a | grep -q "${l}" ; then
       export LC_CTYPE=${l}
       export LC_NUMERIC=${l}
@@ -77,5 +78,14 @@ else
 fi
 export LC_COLLATE=C
 
+# Opt out of .net telemetry
+export DOTNET_CLI_TELEMETRY_OPTOUT=1
+
+# Suppress lvm warnings
+export LVM_SUPPRESS_FD_WARNINGS=1
+
+# Default disable SSH forwarding in EARTHLY
+export EARTHLY_SSH_AUTH_SOCK=""
+
 # shellcheck source=/dev/null
 test -e "$HOME/.localenv" && . "$HOME/.localenv"

dotfiles/ssh/config

@@ -4,6 +4,9 @@ Protocol 2
 # Permit Local Overrides
 Include ~/.ssh/config.d/*
 
+# SSH known host hashing doesn't buy much with shell history, etc.
+HashKnownHosts no
+
 # Enable canonicalization, unless overridden
 CanonicalizeHostname        yes
 CanonicalizeFallbackLocal   yes
@@ -26,7 +29,8 @@ Match canonical all
   ForwardAgent                no
   ForwardX11                  no
   ForwardX11Trusted           no
-  ServerAliveInterval         120
+  ServerAliveInterval         30
+  ServerAliveCountMax         3
   UpdateHostKeys              yes
   User                        david
   VerifyHostKeyDNS            yes

dotfiles/ssh/config.d/hak5_config

@@ -0,0 +1,7 @@
+Host hak5squirrel
+  Hostname 172.16.32.1
+  User root
+  StrictHostKeyChecking no
+  UserKnownHostsFile /dev/null
+  HostKeyAlgorithms +ssh-rsa
+  PubkeyAcceptedAlgorithms +ssh-rsa

dotfiles/tmux.conf

@@ -69,3 +69,10 @@ bind C-v run "tmux set-buffer -- \"$(xsel -o -b)\"; tmux paste-buffer"
 
 # Enable logging module, if available
 run-shell "~/.tmux/tmux-logging/logging.tmux || true"
+
+# Enable TMUX Plugin Manager
+# install with:
+# git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm
+set -g @plugin 'tmux-plugins/tpm'
+set -g @plugin 'tmux-plugins/tmux-sensible'
+run-shell "~/.tmux/plugins/tpm/tpm || true"

dotfiles/vimrc

@@ -31,7 +31,9 @@ set number
 set ruler
 
 " Setup viminfo for recording positions, etc.
+if !has('nvim')
   set viminfo='10,\"100,:20,%,n~/.viminfo
+endif
 " Jump back when editing a file
 function! ResCur()
   " Don't jump in git commits since they're generated.
@@ -91,7 +93,6 @@ imap <silent> <F4> <ESC>:set invpaste<CR>:set paste?<CR>
 " Mediocre Hex editing in vim
 " Source: http://vim.wikia.com/wiki/Improved_hex_editing
 " TODO: move to an include
-nnoremap <C-H> :Hexmode<CR>
 command -bar Hexmode call ToggleHex()
 function ToggleHex()
   " hex mode should be considered a read-only operation
@@ -133,20 +134,60 @@ endfunction
 " Options for syntastic
 let g:syntastic_enable_signs = 1
 let g:syntastic_auto_loc_list = 2
+let g:syntastic_check_on_wq = 0
 let g:syntastic_go_checkers = ['govet', 'errcheck', 'go']
 let g:syntastic_python_checkers=['flake8']
 " Because XXE
 let g:syntastic_xml_checkers=['']
 let g:syntastic_xslt_checkers=['']
+autocmd BufReadPost *
+    \  if &readonly
+    \|  let b:syntastic_mode = 'passive'
+    \| else
+    \|  silent! unlet b:syntastic_mode
+    \| endif
 
 " Have F5 run the tests and display errors
 nnoremap <silent> <F5> :SyntasticCheck<CR> :Errors<CR>
 
 " Load vim-ycm if installed on the system level
-if isdirectory("/usr/share/vim-youcompleteme")
+" Currently only works on debian-based systems...
-  let g:ycm_autoclose_preview_window_after_insertion=1
+" It also does not play nicely with virtual envs, so we skip it then
+if isdirectory("/usr/share/vim-youcompleteme") && empty($VIRTUAL_ENV)
   set runtimepath+=/usr/share/vim-youcompleteme
 endif
+let g:ycm_autoclose_preview_window_after_insertion=1
+" Add rust settings
+let g:tmp_rust_path=trim(system("rustc --print sysroot"))
+if isdirectory(g:tmp_rust_path)
+  let g:ycm_rust_toolchain_root=g:tmp_rust_path
+endif
+unlet! g:tmp_rust_path
+
+" Enable vim-bracketed-paste mode
+" From
+" https://github.com/ConradIrwin/vim-bracketed-paste/blob/master/plugin/bracketed-paste.vim
+if exists("g:loaded_bracketed_paste")
+  finish
+endif
+let g:loaded_bracketed_paste = 1
+
+let &t_ti .= "\<Esc>[?2004h"
+let &t_te = "\e[?2004l" . &t_te
+
+function! XTermPasteBegin(ret)
+  set pastetoggle=<f29>
+  set paste
+  return a:ret
+endfunction
+
+execute "set <f28>=\<Esc>[200~"
+execute "set <f29>=\<Esc>[201~"
+map <expr> <f28> XTermPasteBegin("i")
+imap <expr> <f28> XTermPasteBegin("")
+vmap <expr> <f28> XTermPasteBegin("c")
+cmap <f28> <nop>
+cmap <f29> <nop>
 
 " Include a .vimrc.local if it exists
 if filereadable(glob("~/.vimrc.local"))
@@ -179,3 +220,6 @@ autocmd BufRead,BufNewFile Makefile* set noexpandtab
 " Enable filetype support
 " Needs to be at end of vimrc
 filetype plugin indent on
+
+" Disable bell
+set belloff=all

dotfiles/xsessionrc

@@ -1,4 +1,5 @@
 setxkbmap -option ctrl:nocaps -option compose:ralt
 test -x /usr/bin/xsettingsd && /usr/bin/xsettingsd &
 test -f "$HOME/.env" && "$HOME/.env"
+test -f "$HOME/.shenv" && "$HOME/.shenv"
 test -f "$HOME/.profile" && . "$HOME/.profile"

dotfiles/zshrc

@@ -66,7 +66,8 @@ zstyle ':completion::complete:*' use-cache on
 zstyle ':completion::complete:*' cache-path "${ZDOTDIR:-$HOME}/.zcompcache"
 
 # .profile is universal
-. ~/.profile
+emulate sh -c '. /etc/profile'
+emulate sh -c '. ~/.profile'
 # Deduplicate the path
 typeset -U path
 
@@ -105,13 +106,17 @@ if [[ $- == *i* ]] ; then
   # Virtualenvwrapper
   if test -f /usr/share/virtualenvwrapper/virtualenvwrapper_lazy.sh ; then
     source /usr/share/virtualenvwrapper/virtualenvwrapper_lazy.sh
+  elif test -f /usr/bin/virtualenvwrapper_lazy.sh ; then
+    source /usr/bin/virtualenvwrapper_lazy.sh
   fi
   if command ls --version >/dev/null 2>&1 ; then
-    alias ls="$(whence -p ls) --color -C"
+    alias ls="$(whence -p ls) --color=auto"
   fi
   # Syntax highlighting and substring search
   if test -f /usr/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh ; then
     source /usr/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+  elif test -f /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh ; then
+    source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
   fi
   if test -f ${HOME}/.zshrc.d/_zsh-history-substring-search.zsh ; then
     source ${HOME}/.zshrc.d/_zsh-history-substring-search.zsh
@@ -121,13 +126,20 @@ if [[ $- == *i* ]] ; then
     bindkey -M vicmd 'j' history-substring-search-down
   fi
   # Suggestions
-  if test -f /usr/share/zsh-autosuggestions/zsh-autosuggestions.zsh ; then
+  for sugg_path in /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh /usr/share/zsh-autosuggestions/zsh-autosuggestions.zsh ; do
+    if test -f "${sugg_path}"; then
       # Works well for solarized
       ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=10"
       # Strategy -- note that 'completion' is slow AF
       ZSH_AUTOSUGGEST_STRATEGY=(history)
-    source /usr/share/zsh-autosuggestions/zsh-autosuggestions.zsh
+      source "${sugg_path}"
+      break
     fi
+  done
+  unset sugg_path
+  # History
+  alias fullhist="history 1"
+  alias longhist="history -1000"
 fi  # End interactive-only block
 
 # In case ack is named ack-grep
@@ -140,13 +152,20 @@ if test -d ${HOME}/.cargo/bin ; then
   PATH=${PATH}:${HOME}/.cargo/bin
 fi
 
-# Most is nice, if we have it
+# Pip packages
-if command -v most >/dev/null 2>&1; then
+if test -d ${HOME}/.local/bin ; then
-  export PAGER="most"
+  PATH=${PATH}:${HOME}/.local/bin
+fi
+
+if test -z "${PAGER}" && command -v less >/dev/null 2>&1; then
+  export PAGER="less"
 fi
 
 # Load any local settings
 if [ -e $HOME/.zshrc.local ] ; then source $HOME/.zshrc.local ; fi
 
 # Set prompt based on local settings
-prompt "${THEME:-matir}"
+if test -f "${HOME}/.zprompt" ; then
+  THEME=${THEME:=$(cat "${HOME}/.zprompt")}
+fi
+prompt "${THEME:-matir}" >/dev/null 2>&1

dotfiles/zshrc.d/aliases.zsh

@@ -0,0 +1,17 @@
+#!/usr/bin/env zsh
+
+# On some systems, bat is batcat
+if ! command -v bat >/dev/null 2>&1 ; then
+  if command -v batcat >/dev/null 2>&1 ; then
+    alias bat=$(command -v batcat)
+  fi
+fi
+
+# FFUF aliases
+if command -v ffuf >/dev/null 2>&1 ; then
+  if test -d $HOME/tools/seclists ; then
+    alias ffuf-files="ffuf -c -w $HOME/tools/seclists/Discovery/Web-Content/raft-large-files.txt"
+    alias ffuf-dirs="ffuf -c -w $HOME/tools/seclists/Discovery/Web-Content/raft-large-directories.txt"
+    alias ffuf-quick="ffuf -c -w $HOME/tools/seclists/Discovery/Web-Content/quickhits.txt"
+  fi
+fi

dotfiles/zshrc.d/functions.zsh

@@ -0,0 +1,27 @@
+function dumpenv {
+  tr '\0' '\n' < /proc/${1}/environ
+}
+
+if test -x "/sbin/starship" ; then
+  _STARSHIP_PATH="/sbin/starship"
+  function starship_prompt {
+    eval $(/sbin/starship init zsh)
+  }
+elif test -x "${HOME}/tools/starship/starship" ; then
+  _STARSHIP_PATH="${HOME}/tools/starship/starship"
+  function starship_prompt {
+    eval $($HOME/tools/starship/starship init zsh)
+  }
+fi
+if test -f ${HOME}/.zprompt ; then
+  if test "$(cat ${HOME}/.zprompt)" = "starship" ; then
+    if test -n "${_STARSHIP_PATH:-}" ; then
+      eval $(${_STARSHIP_PATH} init zsh)
+    fi
+  fi
+fi
+unset _STARSHIP_PATH
+
+function hashall {
+  tee >(md5sum) | tee >(sha1sum) | sha256sum
+}

dotfiles/zshrc.d/gpg.zsh

@@ -2,6 +2,10 @@ if ! which gpg-agent >/dev/null 2>&1 ; then
   return 1
 fi
 
+if test -f ${HOME}/.no-gpg-agent ; then
+  return 0
+fi
+
 # Set the default paths to gpg-agent files.
 _gpg_agent_conf="${GNUPGHOME:-$HOME/.gnupg}/gpg-agent.conf"
 _gpg_agent_env="${TMPDIR:-/tmp}/gpg-agent.env.$UID"

dotfiles/zshrc.d/prune-broken-symlinks.zsh

@@ -12,7 +12,7 @@ prune-broken-symlinks() {
     ASK=1
   fi
   DIR=${1:-.}
-  FINDCMD=(find -L ${DIR} -type l)
+  FINDCMD=(find -L ${DIR} -xdev -type l)
   if (($ASK)) ; then
     local FILES
     FILES=`${FINDCMD} -print`

dotfiles/zshrc.d/rvm.zsh

@@ -1,14 +1 @@
-# Enable RVM if available
+[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm"
-if [[ -s ${HOME}/.rvm/scripts/rvm ]] ; then
-  source ${HOME}/.rvm/scripts/rvm
-else
-  function install_rvm {
-    export rvm_ignore_dotfiles=yes
-    pushd `mktemp -d`
-    curl -O https://raw.githubusercontent.com/rvm/rvm/master/binscripts/rvm-installer
-    curl -O https://raw.githubusercontent.com/rvm/rvm/master/binscripts/rvm-installer.asc
-    gpg --verify rvm-installer.asc && \
-      bash rvm-installer stable
-    popd
-  }
-fi

dotfiles/zshrc.d/usage.zsh

@@ -1,3 +1,3 @@
-function duf {
+function duh {
      du -sk "$@" | sort -n | while read size fname; do for unit in K M G T P E Z Y; do if [ $size -lt 1024 ]; then echo -e "${size}${unit}\t${fname}"; break; fi; size=$((size/1024)); done; done
 }

install.sh

@@ -1,9 +1,14 @@
 #!/usr/bin/env bash
 
+# shellcheck disable=SC2155,SC2223
+
 set -o nounset
 set -o errexit
 set -o shwordsplit 2>/dev/null || true  # Make zsh behave like bash
 
+USER=${USER:-$(id -un)}
+HOME=${HOME:-$(cd ~ && pwd)}
+
 case $(uname) in
   Linux)
     FINDTYPE="-xtype"
@@ -18,7 +23,7 @@ case $(uname) in
 esac
 
 is_comment() {
-  if [ $(echo "${1}" | cut -c1-1) = '#' ] ; then
+  if [ "$(echo "${1}" | cut -c1-1)" = '#' ] ; then
     true
   else
     false
@@ -26,17 +31,17 @@ is_comment() {
 }
 
 prerequisites() {
-  if which zsh > /dev/null 2>&1 ; then
+  if command -v zsh > /dev/null 2>&1 ; then
     case $- in
       *i*)
-        case $(getent passwd $USER | cut -d: -f7) in
+        case "$(getent passwd "${USER}" | cut -d: -f7)" in
           */zsh)
             ;;
           *)
-            if [ $(id) -ne 0 ] ; then
+            if [ "$(id)" -ne 0 ] ; then
               echo 'Enter password to change shell.' >&2
             fi
-            chsh -s $(which zsh)
+            chsh -s "$(command -v zsh)"
             ;;
         esac
         ;;
@@ -51,9 +56,10 @@ install_dotfile_dir() {
   local dotfile
   local submodule_prune="$(git -C "${BASEDIR}" submodule status -- "${SRCDIR}" 2>/dev/null | \
     awk '{print $2}' | \
-    while read submod ; do
+    while read -r submod ; do
       echo -n " -o -path ${BASEDIR}/${submod}"
     done)"
+  # shellcheck disable=SC2086
   find "${SRCDIR}" \( -name .git -o \
                     -path "${SRCDIR}/private_dotfiles" -o \
                     -name install.sh -o \
@@ -61,17 +67,17 @@ install_dotfile_dir() {
                     -name .gitignore \
                     ${submodule_prune} \) \
       -prune -o ${FINDTYPE} f -print | \
-    while read dotfile ; do
+    while read -r dotfile ; do
-      local TARGET="${HOME}/.${dotfile#${SRCDIR}/}"
+      local TARGET="${HOME}/.${dotfile#"${SRCDIR}"/}"
-      mkdir -p $(dirname "${TARGET}")
+      mkdir -p "$(dirname "${TARGET}")"
       ln -s -f "${dotfile}" "${TARGET}"
     done
   git -C "${BASEDIR}" submodule status -- "${SRCDIR}" 2>/dev/null | \
     awk '{print $2}' | \
-    while read submodule ; do
+    while read -r submodule ; do
       local FULLNAME="${BASEDIR}/${submodule}"
-      local TARGET="${HOME}/.${FULLNAME#${SRCDIR}/}"
+      local TARGET="${HOME}/.${FULLNAME#"${SRCDIR}"/}"
-      mkdir -p $(dirname "${TARGET}")
+      mkdir -p "$(dirname "${TARGET}")"
       if test -L "${TARGET}" ; then
         if [ "$(readlink "${TARGET}")" != "${FULLNAME}" ] ; then
           echo "${TARGET} points to $(readlink "${TARGET}") not ${FULLNAME}!" >/dev/stderr
@@ -89,39 +95,39 @@ install_basic_dir() {
   local DESTDIR="${2}"
   local file
   find "${SRCDIR}" ${FINDTYPE} f -print | \
-    while read file ; do
+    while read -r file ; do
-    local TARGET="${2}/${file#${SRCDIR}/}"
+    local TARGET="${2}/${file#"${SRCDIR}"/}"
-    mkdir -p $(dirname "${TARGET}")
+    mkdir -p "$(dirname "${TARGET}")"
     ln -s -f "${file}" "${TARGET}"
   done
 }
 
 install_git() {
   # Install or update a git repository
-  if ! which git > /dev/null ; then
+  if ! command -v git > /dev/null 2>&1 ; then
     return 1
   fi
   local REPO="${*: -2:1}"
   local DESTDIR="${*: -1:1}"
-  set -- ${@:1:$(($#-2))}
+  set -- "${@:1:$(($#-2))}"
-  if [ -d ${DESTDIR}/.git ] ; then
+  if [ -d "${DESTDIR}/.git" ] ; then
-    ( cd ${DESTDIR} ; git pull -q )
+    ( cd "${DESTDIR}" ; git pull -q )
   else
-    if [ ${MINIMAL} -eq 1 ] ; then
+    if [ "${MINIMAL}" -eq 1 ] ; then
-      git clone --depth 1 $* ${REPO} ${DESTDIR}
+      git clone --depth 1 "$@" "${REPO}" "${DESTDIR}"
     else
-      git clone $* ${REPO} ${DESTDIR}
+      git clone "$@" "${REPO}" "${DESTDIR}"
     fi
   fi
 }
 
 add_bin_symlink() {
-  local LINKNAME=${HOME}/bin/${2:-$(basename $1)}
+  local LINKNAME="${HOME}/bin/${2:-$(basename "$1")}"
-  if [ -e ${LINKNAME} -a ! -h ${LINKNAME} ] ; then
+  if [ -e "${LINKNAME}" ] && ! [ -h "${LINKNAME}" ] ; then
     echo "Refusing to overwrite ${LINKNAME}" >&2
     return 1
   fi
-  ln -sf ${1} ${LINKNAME}
+  ln -sf "${1}" "${LINKNAME}"
 }
 
 postinstall() {
@@ -131,24 +137,24 @@ postinstall() {
 ssh_key_already_installed() {
   # Return 1 if the key isn't already installed, 0 if it is
   local AK="${HOME}/.ssh/authorized_keys"
-  if [ ! -f $AK ] ; then
+  if [ ! -f "$AK" ] ; then
     return 1
   fi
-  local KEYFP=$(ssh-keygen -l -f $1 2>/dev/null | awk '{print $2}')
+  local KEYFP="$(ssh-keygen -l -f "$1" 2>/dev/null | awk '{print $2}')"
-  local TMPF=$(mktemp)
+  local TMPF="$(mktemp)"
   local key
-  while read key ; do
+  while read -r key ; do
     if is_comment "${key}" ; then
       continue
     fi
-    echo "$key" > $TMPF
+    echo "$key" > "$TMPF"
-    local EFP=$(ssh-keygen -l -f ${TMPF} 2>/dev/null | awk '{print $2}')
+    local EFP="$(ssh-keygen -l -f "${TMPF}" 2>/dev/null | awk '{print $2}')"
     if [ "$EFP" = "$KEYFP" ] ; then
-      rm $TMPF 2>/dev/null
+      rm "$TMPF" 2>/dev/null
       return 0
     fi
-  done < ${AK}
+  done < "${AK}"
-  rm $TMPF 2>/dev/null
+  rm "$TMPF" 2>/dev/null
   return 1
 }
 
@@ -158,30 +164,30 @@ install_ssh_keys() {
   local AK="${HOME}/.ssh/authorized_keys"
   local key
   local keydir
-  if test ${TRUST_ALL_KEYS} = 1 ; then
+  if test "${TRUST_ALL_KEYS}" = 1 ; then
-    keydir=${BASEDIR}/keys/ssh
+    keydir="${BASEDIR}/keys/ssh"
   else
-    keydir=${BASEDIR}/keys/ssh/trusted
+    keydir="${BASEDIR}/keys/ssh/trusted"
   fi
-  for key in ${keydir}/* ; do
+  for key in "${keydir}"/* ; do
     if [ ! -f "${key}" ] ; then
       continue
     fi
     if ssh_key_already_installed "${key}" ; then
-      verbose "Key $(basename ${key}) already installed..."
+      verbose "Key $(basename "${key}") already installed..."
       continue
     fi
-    echo "# $(basename ${key}) added from skel on $(date +%Y-%m-%d)" >> ${AK}
+    echo "# $(basename "${key}") added from skel on $(date +%Y-%m-%d)" >> "${AK}"
-    cat ${key} >> ${AK}
+    cat "${key}" >> "${AK}"
   done
 }
 
 install_gpg_keys() {
-  which gpg >/dev/null 2>&1 || \
+  command -v gpg >/dev/null 2>&1 || \
     return 0
   local key
-  for key in ${BASEDIR}/keys/gpg/* ; do
+  for key in "${BASEDIR}"/keys/gpg/* ; do
-    gpg --import < ${key} >/dev/null 2>&1
+    gpg --import < "${key}" >/dev/null 2>&1
   done
 }
 
@@ -190,13 +196,14 @@ install_known_hosts() {
   if [ ! -f "${BASEDIR}/keys/known_hosts" ] ; then
     return 0
   fi
-  mkdir -p ${HOME}/.ssh
+  mkdir -p "${HOME}/.ssh"
   if [ -f "${HOME}/.ssh/known_hosts" ] ; then
-    local tmpf=$(mktemp)
+    local tmpf="$(mktemp)"
-    cat ${BASEDIR}/keys/known_hosts ${HOME}/.ssh/known_hosts | sort -u > $tmpf
+    cat "${BASEDIR}"/keys/known_hosts "${HOME}"/.ssh/known_hosts \
-    mv $tmpf ${HOME}/.ssh/known_hosts
+      | sort -u > "$tmpf"
+    mv "$tmpf" "${HOME}"/.ssh/known_hosts
   else
-    cp ${BASEDIR}/keys/known_hosts ${HOME}/.ssh/known_hosts
+    cp "${BASEDIR}"/keys/known_hosts "${HOME}"/.ssh/known_hosts
   fi
 }
 
@@ -212,10 +219,10 @@ is_deb_system() {
 
 run_as_root() {
   # Attempt to run as root
-  if [ ${USER} = "root" ] ; then
+  if [ "${USER}" = "root" ] ; then
     "$@"
     return $?
-  elif test -x $(which sudo 2>/dev/null) ; then
+  elif test -x "$(command -v sudo 2>/dev/null)" ; then
     verbose "Using sudo to run ${1}..."
     sudo "$@"
     return $?
@@ -227,24 +234,25 @@ install_pkg_set() {
   local pkg_file=${BASEDIR}/${1}
   local pkg_list=""
   if [ ! -f "${pkg_file}" ] ; then
-    echo "Package set $(basename ${pkg_file}) does not exist." 1>&2
+    echo "Package set $(basename "${pkg_file}") does not exist." 1>&2
     return 1
   fi
-  while read line ; do
+  while read -r line ; do
     if is_comment "${line}" ; then
       continue
     fi
     if [ -z "${line}" ] ; then
       continue
     fi
-    if [ "$(apt-cache -q show ${line} 2>/dev/null)" != "" ] ; then
+    if [ "$(apt-cache -q show "${line}" 2>/dev/null)" != "" ] ; then
       pkg_list="${pkg_list} ${line}"
     else
       echo "Warning: package ${line} not found." >&2
     fi
-  done < ${pkg_file}
+  done < "${pkg_file}"
   if [ -n "${pkg_list}" ] ; then
     verbose "Installing ${pkg_list}"
+    # shellcheck disable=SC2086
     run_as_root apt-get install -qqy ${pkg_list}
   fi
 }
@@ -254,25 +262,25 @@ install_apt_pkgs() {
     ( echo "Can't run apt-get commands" >&2 && \
       return 1 )
   install_pkg_set packages.minimal
-  if test $MINIMAL = 1 ; then
+  if test "$MINIMAL" = 1 ; then
     return 0
   fi
-  test $HAVE_X = 1 && install_pkg_set packages.X
+  test "$HAVE_X" = 1 && install_pkg_set packages.X
-  test $IS_KALI = 1 && install_pkg_set packages.kali
+  test "$IS_KALI" = 1 && install_pkg_set packages.kali
-  install_pkg_set packages.${ARCH}
+  install_pkg_set "packages.${ARCH}"
-  test $HAVE_X = 1 && install_chrome
+  test "$HAVE_X" = 1 && install_chrome
 }
 
 install_chrome() {
-  local TMPD=$(mktemp -d)
+  local TMPD="$(mktemp -d)"
-  local CHROME_ARCH=$(echo ${ARCH} | sed 's/x86_64/amd64/')
+  local CHROME_ARCH="${ARCH/x86_64/amd64}"
   dpkg-query -l 'google-chrome*' >/dev/null 2>&1 && return 0
-  /usr/bin/wget --quiet -O ${TMPD}/google-chrome.deb \
+  /usr/bin/wget --quiet -O "${TMPD}/google-chrome.deb" \
-    https://dl.google.com/linux/direct/google-chrome-beta_current_${CHROME_ARCH}.deb
+    "https://dl.google.com/linux/direct/google-chrome-beta_current_${CHROME_ARCH}.deb"
-  run_as_root /usr/bin/dpkg -i ${TMPD}/google-chrome.deb || \
+  run_as_root /usr/bin/dpkg -i "${TMPD}/google-chrome.deb" || \
     run_as_root /usr/bin/apt-get install -qq -f -y || \
     ( echo "Could not install chrome." >&2 && return 1 )
-  rm -rf ${TMPD}
+  rm -rf "${TMPD}"
 }
 
 setup_git_email() {
@@ -283,8 +291,8 @@ setup_git_email() {
   if [ "${USER:0:5}" != "david" ] ; then
     return 0
   fi
-  local domain="$(hostname -f | egrep -o '[a-z0-9-]+\.[a-z0-9-]+$')"
+  local domain="$(hostname -f | grep -E -o '[a-z0-9-]+\.[a-z0-9-]+$')"
-  case $(echo ${domain} | md5sum | awk '{print $1}') in
+  case "$(echo "${domain}" | md5sum | awk '{print $1}')" in
     b21a24d528346ef7d3932306ed96ede5|a5ed434a3f5089b489576cceab824f25)
       ;;
     *)
@@ -296,27 +304,28 @@ setup_git_email() {
 
 read_saved_prefs() {
   # Can't use basedir here as we don't have it yet
-  local old_pref_file=$(dirname $0)/installed-prefs
+  local old_pref_file="$(dirname "$0")/installed-prefs"
-  local pref_file=$(dirname $0)/.installed-prefs
+  local pref_file="$(dirname "$0")/.installed-prefs"
-  if [ -f ${old_pref_file} -a ! -f ${pref_file} ] ; then
+  if [ -f "${old_pref_file}" ] && ! [ -f "${pref_file}" ] ; then
-    mv ${old_pref_file} ${pref_file}
+    mv "${old_pref_file}" "${pref_file}"
   fi
-  if [ -f ${pref_file} ] ; then
+  if [ -f "${pref_file}" ] ; then
     verbose "Loading saved skel preferences from ${pref_file}"
     # source is a bashism
-    . ${pref_file}
+    # shellcheck disable=SC1090
+    . "${pref_file}"
   fi
 }
 
 save_prefs() {
-  test $SAVE = 1 || return 0
+  test "$SAVE" = 1 || return 0
   local pref_file=${BASEDIR}/.installed-prefs
   (echo_pref BASEDIR
    echo_pref MINIMAL
    echo_pref INSTALL_KEYS
    echo_pref TRUST_ALL_KEYS
    echo_pref INSTALL_PKGS
-   echo_pref VERBOSE) > $pref_file
+   echo_pref VERBOSE) > "$pref_file"
 }
 
 echo_pref() {
@@ -338,42 +347,51 @@ EOF
 }
 
 verbose() {
-  test ${VERBOSE:-0} = 1 && echo "$@" >&2 || return 0
+  test "${VERBOSE:-0}" = 1 && echo "$@" >&2 || return 0
 }
 
 # Operations
 
 install_dotfiles() {
   install_dotfile_dir "${BASEDIR}/dotfiles"
-  test -d "${BASEDIR}/private_dotfiles" && \
+  if test -d "${BASEDIR}/private_dotfiles" && \
-    test -d "${BASEDIR}/.git/git-crypt" && \
+      test -d "${BASEDIR}/.git/git-crypt" ; then
-    install_dotfile_dir "${BASEDIR}/private_dotfiles" || \
+    install_dotfile_dir "${BASEDIR}/private_dotfiles"
-    true
+  fi
-  test -d "${BASEDIR}/local_dotfiles" && \
+  if test -d "${BASEDIR}/local_dotfiles" ; then
-    install_dotfile_dir "${BASEDIR}/local_dotfiles" || \
+    install_dotfile_dir "${BASEDIR}/local_dotfiles"
-    true
+  fi
+  if test -d "${BASEDIR}/dotfile_overlays" ; then
+    for dotfiledir in "${BASEDIR}/dotfile_overlays/"* ; do
+      if test -d "${dotfiledir}" ; then
+        install_dotfile_dir "${dotfiledir}"
+      fi
+    done
+  fi
 }
 
 install_main() {
-  test -d ${BASEDIR}/.git && command -v git >/dev/null 2>&1 && \
+  if test -d "${BASEDIR}/.git" ; then
-    git -C ${BASEDIR} pull --ff-only
+    command -v git >/dev/null 2>&1 && \
-  test $MINIMAL = 1 || ( command -v git >/dev/null 2>&1 && \
+      git -C "${BASEDIR}" pull --ff-only
-    git -C ${BASEDIR} submodule update --init --recursive )
+    test "$MINIMAL" = 1 || ( command -v git >/dev/null 2>&1 && \
-  test $MINIMAL = 1 || prerequisites
+      git -C "${BASEDIR}" submodule update --init --recursive )
-  test $INSTALL_PKGS = 1 && is_deb_system && install_apt_pkgs
+  fi
+  test "$MINIMAL" = 1 || prerequisites
+  test "$INSTALL_PKGS" = 1 && is_deb_system && install_apt_pkgs
   install_dotfiles
   install_basic_dir "${BASEDIR}/bin" "${HOME}/bin"
-  test $MINIMAL = 1 || postinstall
+  test "$MINIMAL" = 1 || postinstall
-  test $INSTALL_KEYS = 1 && install_keys
+  test "$INSTALL_KEYS" = 1 && install_keys
   save_prefs
   setup_git_email
   cleanup
 }
 
 install_dconf() {
-  which dconf >/dev/null 2>&1 || return 1
+  command -v dconf >/dev/null 2>&1 || return 1
-  find "${BASEDIR}/dconf" -type f -printf '/%P\n' | while read dcpath ; do
+  find "${BASEDIR}/dconf" -type f -printf '/%P\n' | while read -r dcpath ; do
-    dconf load ${dcpath}/ < "${BASEDIR}/dconf/${dcpath}"
+    dconf load "${dcpath}/" < "${BASEDIR}/dconf/${dcpath}"
   done
 }
 
@@ -391,12 +409,12 @@ read_saved_prefs
 : ${SAVE:=1}
 
 # Check prerequisites
-if [ ! -d $BASEDIR ] ; then
+if [ ! -d "$BASEDIR" ] ; then
   echo "Please install to $BASEDIR!" 1>&2
   exit 1
 fi
 
-if which dpkg-query > /dev/null 2>&1 ; then
+if command -v dpkg-query > /dev/null 2>&1 ; then
   HAVE_X=$(dpkg-query -s xserver-xorg 2>/dev/null | \
     grep -c 'Status.*installed' \
     || true)
@@ -418,7 +436,7 @@ case $OPERATION in
     ;;
   package*)
     PKG_SET=${2:-minimal}
-    install_pkg_set packages.${PKG_SET}
+    install_pkg_set "packages.${PKG_SET}"
     ;;
   test)
     # Do nothing, just sourcing

keys/sjca_cert.pem

@@ -0,0 +1,36 @@
+-----BEGIN CERTIFICATE-----
+MIIGTDCCBDSgAwIBAgIUBJJdpXynkaMkAKg/4trLTOxqjrwwDQYJKoZIhvcNAQEL
+BQAwgZUxEzARBgoJkiaJk/IsZAEZFgNjb20xHjAcBgoJkiaJk/IsZAEZFg5zeXN0
+ZW1vdmVybG9yZDESMBAGCgmSJomT8ixkARkWAnNqMRcwFQYDVQQKDA5TeXN0ZW1P
+dmVybG9yZDEQMA4GA1UECwwHSG9tZSBDQTEfMB0GA1UEAwwWU3lzdGVtT3Zlcmxv
+cmQgSG9tZSBDQTAeFw0yMDA1MTUwMzM0NTBaFw0yMjA1MTUwMzM0NTBaMIGVMRMw
+EQYKCZImiZPyLGQBGRYDY29tMR4wHAYKCZImiZPyLGQBGRYOc3lzdGVtb3Zlcmxv
+cmQxEjAQBgoJkiaJk/IsZAEZFgJzajEXMBUGA1UECgwOU3lzdGVtT3ZlcmxvcmQx
+EDAOBgNVBAsMB0hvbWUgQ0ExHzAdBgNVBAMMFlN5c3RlbU92ZXJsb3JkIEhvbWUg
+Q0EwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDc/NBJVtiUvuqvx4Id
+DAJuHOJCcK4GKVcmHXDVeF/xyV/WjKwxGFQ8cTIbwxPPc6SNrIPLkdqiJZusILHZ
+AD34xcK0ojuyRohTyBk2YJVyj/XRfVw8W3+ywoJ4dm+XVgyQxm1XRJGpxQZ8QD4s
+Z4g32gzirCNCvZGxra9xTWqPZF3Q3YD2p2jPw4i9BbC9Ubav9/8d7KHhIvh0AI+h
+qKJv63dNMAo6CsxB1uzJ8XdKY+doJRvZ5OBoJx5e95iQ0kzPt3HLBpl3qJRkSyDQ
+8L1A35MhIu6Ua6lJF5aCijL9sbvB+PvdJWSENEZRQYG5+jxiXtXLaFv48cFnTvQP
+ZGrn3RDX/WDQd9VtmHqa7fYkK50FmwwoTHht9ph+g4jQGxSbnZMgTLXXbDnSSsXs
+w6AoE/aPsPuPyuHgl5ZYTq4rTU2MwGcwrFcr49I9o5xcmss4oTsjX7hTuRuWxF5e
+20DqV/xq+tOSusw4jCpBVUvOHmzCEvS2wQE02+vGRQayU9x1cUxoO3ljeObnzVp5
+8/X628pHydxO+UGw/Y0d70OCwtZPkBLKOYmIgKGYhvV7r+3knxSyPwYL2Or21Pkf
+hKfEaLdhCOrrYAdT8SE3Y9l5jsrtIIqU0WlG8/43r2tBipERIKUwTGyGcOOtAShh
+ewLJvqRbmoX91t03So+2lgoRywIDAQABo4GRMIGOMA4GA1UdDwEB/wQEAwIBBjAS
+BgNVHRMBAf8ECDAGAQH/AgEAMB0GA1UdDgQWBBTri98GnxlLYIUxCljntpfw8Rui
+vzAfBgNVHSMEGDAWgBTri98GnxlLYIUxCljntpfw8RuivzAoBgNVHR4BAf8EHjAc
+oBowGIIWLnNqLnN5c3RlbW92ZXJsb3JkLmNvbTANBgkqhkiG9w0BAQsFAAOCAgEA
+YLEfQ6YJucxzxmBt6wrutfJZsvpj5N6qgJ8oLePNmK8KOhRT0scBLS5Oy5thEl9X
+1Kt1W5/Wk0zegc3IivovbIAGwyYRbhdn7rNVYZJhItRgNaoyfBAHQk5YyNiWjRgQ
+MuNQUvS6n7nK8rizRINKwtcUozskjcDYnr71A+oyjGfl48a/RbuVL+bydRJ0jX7a
+5uTPbiAZKf4K150jQSq9Rt6AbBwdRbgsudsh4m/LaNLIEvI2RdBuLqP2O8c5SVAM
+KrVXwH5MPp/7nlPw2UZrKL/NkM0BJw5ldLndGa1hwKbZPxs7dvLnmaRN7CeYZ+mP
+kefxBt+Ql2qcBLog9il5+3W3F2oc+Ti68mmI7h1oYRT3jh2YAV+WVM0hvre/kgt0
+9rTAW3KAyGG0GRiaCfADUd1FwFFTyzwTL4fN6wlYnPRFoex/8QQUo6DNmWibvc0W
+e4jW/rsc7KCqsAwasuHJYzxJgN1jOMfD7/6jgVQJEz+JZnEBvszgd+QMMlR38P/W
+cpp8fYPtFs+TNDIG2/aqGcIl8j7ppjPOrEFNLHdS0633+mni34Qb+qD85jqPb24i
+1vF1pBO5CJjvOcqOFbAS3IT4i74oM1BpuD6LBk5u5PYJa/VM2SKsEbGPqpvarAZe
+vSgWTzwGJmUEVCnFM/EFbsxyfcoGwcfLMCM2ioyoxmk=
+-----END CERTIFICATE-----

keys/ssh/id_ecdsa_chromebook.pub

@@ -1 +0,0 @@
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBIsFYLEsalNh/l6PtMZhi0f/eZ22uoMw/xYpgPy6vBU6OlpN2FjW7R0pwX29fZjjVQoF0eEG0K/9/CcYcnxtspw= chronos@localhost

keys/ssh/id_ecdsa_gibson.pub

@@ -1 +0,0 @@
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPee2Rw1yiE9RIrXzslop9dnYgIc3shhXVk5+bPv/BrC8swklnYUSjQOU/lJuAjJJ9X7rx9kvgmL337Taa7dGao= davidtomaschik@gibson

keys/ssh/id_ecdsa_human.pub

@@ -1 +0,0 @@
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKI+CwNBBoC1G9M2rRR0P0lWAU9uvEZpvDg+CpD+I9NQOLuy80YJMRwIYgTZVTWo8OUqsKSMzYywP6NdMKVdVGg= david@human

keys/ssh/id_ecdsa_kion.pub

@@ -0,0 +1 @@
+ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJzWFHQZm6jsh2V+ATJPlEKEQdt3tWNojc2elz3hDs5Q9TPHUolE0/R66osFra5Qr/jonEwqzqwRIduxFYSIATc= david@kion

keys/ssh/id_ecdsa_zazu.pub

@@ -0,0 +1 @@
+ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBOP0EQthckpi83EoFXtbPnn4Ytd7FYW6Nb3W9ZahqOKhNAqv1owot957ihKHtGKFnYr0Jwgp0TNOdpz6nV9wwCo= david@zazu

keys/ssh/id_ed25519_glaptop3.pub

@@ -1 +0,0 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHPlKI3Mt2Hm4YZ0WNOET7SEoXmAABR+eEZ3hnJnA9AJ davidtomaschik@davidtomaschik-glaptop3

keys/ssh/id_ed25519_glaptop6.pub

@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJSM/GRj76roLHo0KV9SgNGNlFmnsiWpRm9r51XqSsnu davidtomaschik@davidtomaschik-glaptop6

keys/ssh/id_ed25519_wfh_chromebox.pub

@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICvHatAcnYEJ2BXWGN+MaE40avyghYeEZDgfQD8WcRti david@wfh_chromebook

keys/ssh/id_rsa_glaptop3.pub

@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDi2AoHzzSd/xidvRKS1OE7Pe+aGgyEY1WmWJGJ3POHuaQSbGrp4g1En4QurhXwonPiLBtQ0w6Nbbi/3vrXxSnAkJJKd9LXQtjyXVN68285lRr3DWuWnyokhO3B5aGOb5/4b6Dn8YDRrTRefezjbVavgrTFarZ19PmPmJxH9h+ZPV/hNQ6rZjBjrvGerxpmB6CjgXbIxRdsUcnao3+gyPueBOkyHbfiy7QjQT+SgPjIqT/rza4Q0OqFBTk4D7Y96biE5yY31eNs8H7uvR3PfX0NN5zvP/EqJECPYr/B3vOzAr7B8BsqYbA5UFexrp6gYn+LDzr6jAILhEUp8SsC8UFn davidtomaschik@davidtomaschik-glaptop3

keys/ssh/trusted/id_ecdsa_chromebook.pub

@@ -1 +0,0 @@
-../id_ecdsa_chromebook.pub

keys/ssh/trusted/id_ecdsa_human.pub

@@ -1 +0,0 @@
-../id_ecdsa_human.pub

keys/ssh/trusted/id_ecdsa_zazu.pub

@@ -0,0 +1 @@
+../id_ecdsa_zazu.pub

keys/ssh/trusted/id_rsa_human.pub

@@ -1 +0,0 @@
-../id_rsa_human.pub

keys/ssh/trusted/id_rsa_scar.pub

@@ -0,0 +1 @@
+../id_rsa_scar.pub

packages.cli

@@ -1,15 +1,21 @@
+bat
 binfmt-support
 build-essential
 cryptsetup
 dsniff
+duf
 ecryptfs-utils
+exa
 exuberant-ctags
+fd-find
+fzf
 httpie
 iftop
 iptraf
 ipython
 ipython3
 jarwrapper
+jc
 jq
 kpartx
 ldap-utils
@@ -17,6 +23,7 @@ lvm2
 most
 msitools
 nasm
+nvim
 opensc
 openvpn
 p7zip-full

packages.minimal

@@ -1,17 +1,25 @@
 ack
+bat
 curl
 dnsutils
+exa
+fzf
 gdb
 git
 git-crypt
+git-delta
+glances
 gnupg2
 gnupg-agent
+httpie
 ltrace
 mosh
 ngrep
 nmap
+ripgrep
 strace
 tcpdump
+tldr-py
 tmux
 traceroute
 tshark

udev/99-ftdi.rules

@@ -1 +1,2 @@
-BUS=="usb", SYSFS{idVendor}=="0403", SYSFS{idProduct}=="6014", GROUP="plugdev"
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6014", GROUP="plugdev"
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6015", GROUP="plugdev"