Update packages

New collaborators:

	5DEA789B David Tomaschik <david@systemoverlord.com>

bin/google-chrome-burp

@@ -1,3 +1,21 @@
 #!/bin/bash
+
+CHROME_BINS="google-chrome-beta google-chrome"
+for bin in ${CHROME_BINS} ; do
+  if command -v ${bin} >/dev/null 2>&1 ; then
+    CHROME=$(command -v ${bin})
+    break
+  fi
+done
+
+if test -z "${CHROME}" ; then
+  echo "Chrome not found!" >/dev/stderr
+  exit 1
+fi
+
+# Set alternate HOME to use alternate NSS DB
+export HOME=${HOME}/.chrome-pentest
+mkdir -p ${HOME}
+
 # Launch chrome for burp
-exec /usr/bin/google-chrome-beta --ignore-certificate-errors --user-data-dir=${HOME}/.config/chrome-pentest --proxy-server=127.0.0.1:8080
+exec ${CHROME} --user-data-dir=${HOME}/chrome-pentest --proxy-server=127.0.0.1:8080

bin/i3lock.sh

@@ -1,9 +1,10 @@
 #!/bin/sh
+LOCKTIME="${SCREENSAVER_MIN:-5}"
 LOCKER="i3lock -c 000000"
 # intentionally want word splitting below
 /usr/bin/xss-lock -- ${LOCKER} &
 exec /usr/bin/xautolock \
-  -time 5 \
+  -time "${LOCKTIME}" \
   -detectsleep \
   -locker "${LOCKER}" \
   -notify 30 \

bin/install_tool

@@ -6,6 +6,7 @@ REINSTALL=0
 PACKAGES=1
 
 while getopts -- "-:" a ; do
+  # shellcheck disable=SC2154
   case "${a}" in
     -)
       case "${OPTARG}" in
@@ -20,6 +21,11 @@ while getopts -- "-:" a ; do
           exit 1
           ;;
       esac
+      ;;
+    *)
+      echo "Unknown short option ${OPTARG}" >/dev/stderr
+      exit 1
+      ;;
   esac
 done
 
@@ -68,7 +74,7 @@ function check_sudo {
 function add_bin_symlink {
   local TARGET NAME BINDIR
   TARGET="${1}"
-  NAME="${2:-$(basename ${1})}"
+  NAME="${2:-$(basename "${1}")}"
   BINDIR="${HOME}/bin/tools/"
   mkdir -p -- "${BINDIR}"
   ln -sf "${DESTDIR}/${TARGET}" "${BINDIR}/${NAME}"
@@ -170,7 +176,7 @@ case ${TOOL} in
     ;;
   mitmproxy)
     makedest_or_die
-    ver=$(python -c 'import urllib2; import json; print(json.load(urllib2.urlopen("https://api.github.com/repos/mitmproxy/mitmproxy/releases/latest"))["name"].replace("v",""))')
+    ver=$(python3 -c 'from urllib import request; import json; print(json.load(request.urlopen("https://api.github.com/repos/mitmproxy/mitmproxy/releases/latest"))["tag_name"].replace("v",""))')
     download \
       "https://snapshots.mitmproxy.org/${ver}/mitmproxy-${ver}-linux.tar.gz" \
       /tmp/mitmproxy.tar.gz
@@ -214,7 +220,7 @@ case ${TOOL} in
     ;;
   cyberchef)
     makedest
-    src=$(python -c 'import urllib2; import json; print(filter(lambda x: x["name"]=="cyberchef.htm", json.load(urllib2.urlopen("https://api.github.com/repos/gchq/CyberChef/releases/latest"))["assets"])[0]["browser_download_url"])')
+    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"])')
     download "${src}" "${DESTDIR}/cyberchef.html"
     ;;
   apktool)
@@ -259,6 +265,81 @@ case ${TOOL} in
       https://github.com/hugsy/gef/raw/master/gef.py \
       "${DESTDIR}/gef.py"
     ;;
+  aflplusplus)
+    install_pkgs libtool-bin libglib2.0-dev libpixman-1-dev clang clang-tools \
+      llvm
+    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
+    else
+      git clone --depth 1 \
+        https://github.com/offensive-security/exploitdb.git \
+        "${DESTDIR}"
+      add_bin_symlink searchsploit
+      cp "${DESTDIR}/.searchsploit_rc" "${HOME}/.searchsploit_rc"
+      sed -i "s|/opt/exploitdb|${DESTDIR}|" "${HOME}/.searchsploit_rc"
+    fi
+    ;;
+  cura)
+    makedest
+    ver=$(python3 -c 'from urllib import request; import json; print(json.load(request.urlopen("https://api.github.com/repos/Ultimaker/Cura/releases/latest"))["name"].replace("v",""))')
+    echo "Latest Cura is ${ver}"
+    download \
+      "https://github.com/Ultimaker/Cura/releases/download/${ver}/Cura-${ver}.AppImage" \
+      "${DESTDIR}/Cura.AppImage"
+    chmod +x "${DESTDIR}/Cura.AppImage"
+    add_bin_symlink "Cura.AppImage" cura
+    ;;
+  rr)
+    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 \
+      "https://github.com/mozilla/rr/releases/download/${ver}/rr-${ver}-Linux-$(uname -m).deb" \
+      "/tmp/rr.deb"
+    sudo dpkg -i /tmp/rr.deb
+    ;;
+  nmap-parse-output)
+    git clone --depth 1 \
+      https://github.com/ernw/nmap-parse-output.git \
+      "${DESTDIR}"
+    add_bin_symlink nmap-parse-output
+    cat <<EOF >"${HOME}/.zshrc.d/99-nmap-parse-output.zsh"
+if test -d ${DESTDIR} ; then
+  autoload bashcompinit
+  bashcompinit
+  source ${DESTDIR}/_nmap-parse-output
+fi
+EOF
+    ;;
+  logiops)
+    install_pkgs cmake libevdev-dev libudev-dev libconfig++-dev checkinstall
+    git clone "https://github.com/PixlOne/logiops.git" "${DESTDIR}"
+    mkdir -p "${DESTDIR}/build"
+    cd "${DESTDIR}/build"
+    cmake ..
+    make
+    sudo checkinstall --pkgname logiops --maintainer "${USER}" -y
+    ;;
+  aws)
+    DN=$(mktemp -d)
+    cd "${DN}"
+    curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "${DN}/awscliv2.zip"
+    unzip "${DN}/awscliv2.zip"
+    mv "${DN}/aws/dist" "${DESTDIR}"
+    add_bin_symlink aws
+    rm -rf ${DN}
+    ;;
+  tmpmail)
+    install_pkgs curl w3m jq
+    mkdir -p ${DESTDIR}
+    curl -L "https://git.io/tmpmail" > ${DESTDIR}/tmpmail
+    chmod +x ${DESTDIR}/tmpmail
+    add_bin_symlink tmpmail
+    ;;
   *)
     echo "Unknown tool: ${TOOL}" >/dev/stderr
     echo "Options:" >/dev/stderr

bin/nvidia_hold.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+function list_nvidia_installed {
+  dpkg-query -l '*nvidia*' | grep '^[hi]i' | awk '{print $2}'
+}
+
+function hold_or_unhold {
+  apt-mark "${1:-hold}" $(list_nvidia_installed)
+}
+
+case "$1" in
+  hold|h)
+    hold_or_unhold hold
+    ;;
+  unhold|u)
+    hold_or_unhold unhold
+    ;;
+  *)
+    echo "$0 <hold|unhold>" >/dev/stderr
+    exit 1
+    ;;
+esac

bin/pactl_helper

@@ -0,0 +1,46 @@
+#!/bin/bash
+
+function get_active_sink {
+  pactl list short sinks | grep RUNNING | awk '{print $2}'
+}
+
+function get_active_source {
+  pactl list short sources | grep RUNNING | awk '{print $2}'
+}
+
+function get_default_sink {
+  pactl info | grep '^Default Sink:' | awk '{print $NF}'
+}
+
+function get_default_source {
+  pactl info | grep '^Default Source:' | awk '{print $NF}'
+}
+
+function micmute {
+  MODE=${1:-toggle}
+  pactl set-source-mute $(get_default_source) ${MODE}
+}
+
+function mute {
+  MODE=${1:-toggle}
+  pactl set-sink-mute $(get_default_sink) ${MODE}
+}
+
+function volume {
+  VOL="${1}"
+  if test -z "${VOL}" ; then
+    echo "Need volume spec!"
+    exit 1
+  fi
+  pactl set-sink-volume $(get_default_sink) "${VOL}"
+}
+
+case "$1" in
+  mute|micmute|volume)
+    $*
+    ;;
+  *)
+    echo "Unknown command!"
+    exit 1
+    ;;
+esac

bin/qdisc_span.sh

@@ -0,0 +1,48 @@
+#!/bin/bash
+
+set -ue
+
+ACTION="add"
+
+if [ "${1}" == "-d" ] ; then
+  ACTION="del"
+  shift
+fi
+
+BRIDGE="${1}"
+DEST="${2}"
+
+function setup_span {
+  if tc qdisc show dev "${1}" | grep -q 'qdisc ingress ffff' ; then
+    return 0
+  fi
+  tc qdisc add dev "${1}" ingress
+  tc filter add dev "${1}" parent ffff: protocol all u32 match u8 0 0 action mirred egress mirror dev "${DEST}"
+}
+
+function del_span {
+  tc qdisc del dev "${1}" ingress
+}
+
+function handle_iface {
+  case "${ACTION}" in
+    add)
+      setup_span "${1}"
+      ;;
+    del)
+      del_span "${1}"
+      ;;
+    *)
+      echo "Unknown action!"
+      exit 1
+      ;;
+  esac
+}
+
+function get_bridge_ifaces {
+  bridge link | grep "master ${1}" | cut -d: -f2 | cut -d@ -f1
+}
+
+for iface in $(get_bridge_ifaces "${BRIDGE}") ; do
+  handle_iface "$iface"
+done

clone.sh

@@ -4,6 +4,9 @@ set -ue
 
 # Script to clone and install
 
+# Wrapped in a function to prevent incomplete execution if download is
+# interrupted
+function installer_main {
   if ! command -v git >/dev/null 2>&1 ; then
     ( if [ "$EUID" != 0 ] ; then
       sudo apt install -y git
@@ -16,3 +19,6 @@ git clone https://github.com/Matir/skel.git ${HOME}/.skel
 
   ${HOME}/.skel/install.sh
   ${HOME}/.skel/install.sh packages minimal
+}
+
+installer_main

conf/logid.cfg

@@ -0,0 +1,10 @@
+devices: ({
+	name: "Wireless Mouse MX Master 3";
+
+	smartshift: {
+		on: true;
+		threshold: 30;
+	};
+
+	dpi: 1500;
+});

dotfiles/aliases

@@ -40,4 +40,13 @@ alias drop_caches="echo 3 | sudo /usr/bin/tee /proc/sys/vm/drop_caches"
 alias gettemp='printf "%02.2f\n" "$(cat /sys/class/thermal/thermal_zone0/temp)e-3"'
 
 # get git working directory
-alias gitroot="git rev-parse --git-toplevel"
+alias gitroot="git rev-parse --show-toplevel"
+
+# SSH without host key checking
+alias sshanon="ssh -oUserKnownHostsFile=/dev/null -oStrictHostKeyChecking=no"
+
+# Straight to ipython
+alias ipy="ipython3"
+
+# Skip the header on bc
+alias bc="command bc -q"

dotfiles/config/htop/htoprc

@@ -0,0 +1,26 @@
+# Beware! This file is rewritten by htop when settings are changed in the interface.
+# The parser is also very primitive, and not human-friendly.
+fields=0 48 17 18 38 39 40 2 46 47 49 1
+sort_key=47
+sort_direction=1
+hide_threads=0
+hide_kernel_threads=1
+hide_userland_threads=1
+shadow_other_users=0
+show_thread_names=0
+show_program_path=1
+highlight_base_name=0
+highlight_megabytes=1
+highlight_threads=1
+tree_view=0
+header_margin=1
+detailed_cpu_time=0
+cpu_count_from_zero=0
+update_process_names=0
+account_guest_in_cpu_meter=0
+color_scheme=6
+delay=15
+left_meters=AllCPUs Memory Swap
+left_meter_modes=1 1 1
+right_meters=Tasks LoadAverage Uptime
+right_meter_modes=2 2 2

dotfiles/config/i3/config

@@ -135,6 +135,8 @@ bindsym $mod+l exec \
   bash -c "i3lock -c 000000 && (sleep 2 && xset dpms force off) &"
 bindsym $alt+Control+l exec \
   bash -c "i3lock -c 000000 && (sleep 2 && xset dpms force off) &"
+# suspend under systemd
+bindsym $mod+Control+s exec --no-startup-id systemctl suspend
 
 # things to start quickly
 bindsym $mod+g exec /usr/bin/google-chrome-beta --password-store=gnome
@@ -146,9 +148,11 @@ bindsym --whole-window $mod+button3 floating toggle
 
 # media keys
 # Pulse Audio controls
-bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume 0 +5%
-bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume 0 -5%
-bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute 0 toggle
+bindsym XF86AudioRaiseVolume exec --no-startup-id ~/bin/pactl_helper volume +5%
+bindsym XF86AudioLowerVolume exec --no-startup-id ~/bin/pactl_helper volume -5%
+bindsym XF86AudioMute exec --no-startup-id ~/bin/pactl_helper mute toggle
+bindsym XF86AudioMicMute exec --no-startup-id ~/bin/pactl_helper micmute toggle
+bindsym F13 exec --no-startup-id ~/bin/pactl_helper micmute toggle
 # Screen brightness controls
 bindsym XF86MonBrightnessUp exec --no-startup-id xbacklight -inc 10
 bindsym XF86MonBrightnessDown exec --no-startup-id xbacklight -dec 10
@@ -170,15 +174,12 @@ bindsym --release $alt+Sys_Req exec --no-startup-id \
   /usr/bin/scrot -s $screendir/$scrotformat
 
 # useful utilities
-#exec --no-startup-id \
-#  (which xss-lock >/dev/null || /usr/bin/cinnamon-settings-daemon) &
 exec --no-startup-id gnome-keyring-daemon --start --components=pkcs11,secrets
-# Make GTK fonts look great again
-#exec --no-startup-id gnome-settings-daemon
-#exec --no-startup-id (sleep 2; nm-applet) &
 exec --no-startup-id xset r rate 200 20
 #exec --no-startup-id ~/bin/autostart.py
 exec --no-startup-id dex --autostart --environment x-cinnamon
+# Solaar for mouse
+exec --no-startup-id sh -c 'command solaar -w hide || true'
 
 # customize windows
 for_window [window_role="pop-up"] floating enable

dotfiles/env

@@ -6,7 +6,7 @@ umask 027
 # Paths and preferences
 export PYTHONPATH="$HOME/.python:$PYTHONPATH"
 export GOPATH="$HOME/Projects/Go:/usr/share/gocode"
-export PATH="$HOME/bin:/sbin:/usr/sbin:$PATH:$GOPATH/bin"
+export PATH="$HOME/bin:$HOME/bin/tools:/sbin:/usr/sbin:$PATH:$HOME/Projects/Go/bin"
 export VISUAL=vim
 export EDITOR=vim
 export DEBEMAIL="david@systemoverlord.com"
@@ -40,7 +40,6 @@ fi
 
 # For virtualenvwrapper
 export WORKON_HOME=$HOME/.virtualenvs
-export VIRTUALENVWRAPPER_VIRTUALENV_ARGS='--no-site-packages'
 
 # GPG full key id
 export GPG_ID=7FD58D9A196DCEEEAD671F94F4D7A7915DEA789B

dotfiles/gitconfig

@@ -67,3 +67,5 @@
 	prompt = false
 [include]
 	path = ~/.gitconfig.local
+[pull]
+	rebase = false

dotfiles/rsync_ignore

@@ -1,13 +1,24 @@
-tmp
-Downloads
+.AndroidStudio*
+.Genymobile
+.Ticket to Ride*
+.android*
+.arduino*
+.bundle
 .cache
-.local/share/Trash
-.wine
-.thumbnails
+.gradle
 .histfile
+.local/share/Steam
+.local/share/Trash
+.rvm*
+.sqlite_history
+.thumbnails
+.wine
 .zcompdump
 .zcompdump*
-.sqlite_history
-VirtualBox VMs
 Audits
+Downloads
 SpiderOak Hive
+VirtualBox VMs
+tmp
+tools
+.minikube

dotfiles/ssh/config

@@ -14,6 +14,10 @@ CanonicalizeMaxDots         0
 Host *.*
   CheckHostIP                 yes
 
+Host *.cloudshell.dev
+  # Cloudshell hostnames are too long for unix sockets
+  ControlMaster no
+
 Match canonical all
   CheckHostIP                 no
   ControlMaster               auto

dotfiles/ssh/rc

@@ -2,6 +2,6 @@
 
 REMOTE_LINK="${HOME}/.ssh/remote_agent.sock"
 
-if test \! -L "${REMOTE_LINK}" -a -n "${SSH_AUTH_SOCK}" ; then
+if test \! -e "${REMOTE_LINK}" -a -n "${SSH_AUTH_SOCK}" ; then
   ln -sf "${SSH_AUTH_SOCK}" "${REMOTE_LINK}"
 fi

dotfiles/vimrc

@@ -29,6 +29,24 @@ imap <S-Tab> <Esc><<A
 set number
 set ruler
 
+" Setup viminfo for recording positions, etc.
+set viminfo='10,\"100,:20,%,n~/.viminfo
+" Jump back when editing a file
+function! ResCur()
+  " Don't jump in git commits since they're generated.
+  if &ft == 'gitcommit'
+    return
+  endif
+  if line("'\"") <= line("$")
+    normal! g`"
+    return
+  endif
+endfunction
+augroup resCur
+  autocmd!
+  autocmd BufWinEnter * call ResCur()
+augroup END
+
 " File options
 set encoding=utf-8
 " Syntax highlighting, look and feel
@@ -116,6 +134,9 @@ let g:syntastic_enable_signs = 1
 let g:syntastic_auto_loc_list = 2
 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=['']
 
 " Have F5 run the tests and display errors
 nnoremap <silent> <F5> :SyntasticCheck<CR> :Errors<CR>

dotfiles/wgetrc

@@ -6,7 +6,8 @@ content_disposition = on
 # Recursive download options
 no_parent = on
 follow_ftp = on
-adjust_extension = on
+# Good for HTML, not for other things
+adjust_extension = off
 robots = off
 
 # Show responses

dotfiles/zshrc

@@ -83,6 +83,8 @@ bindkey '^h' backward-delete-char
 # ok, a few emacs convenience bindings
 bindkey '^w' backward-kill-word
 bindkey '^r' history-incremental-search-backward
+# delete really deletes
+bindkey "^[[3~" delete-char
 
 # Source extras and aliases if interactive
 if [[ $- == *i* ]] ; then
@@ -92,20 +94,18 @@ if [[ $- == *i* ]] ; then
     source "$file"
   done
   # extra completions, prompt
-  fpath=(~/.zshrc.completions ~/.zshrc.d/matir_prompt $fpath)
+  fpath=(~/.zshrc.completions ~/.zshrc.d/matir_prompt ~/.zshrc.d/agnoster_prompt $fpath)
   # Completion
   zstyle ':compinstall' filename "${HOME}/.zshrc"
   zstyle ':completion:*' users root ${USER}
   # Modules after fpath
   autoload -Uz compinit && compinit -i
   autoload -Uz promptinit && promptinit
-  # Prompt
-  prompt matir
   # Virtualenvwrapper
   if test -f /usr/share/virtualenvwrapper/virtualenvwrapper_lazy.sh ; then
     source /usr/share/virtualenvwrapper/virtualenvwrapper_lazy.sh
   fi
-  if command ls --version 2>&1 >/dev/null ; then
+  if command ls --version >/dev/null 2>&1 ; then
     alias ls="$(whence -p ls) --color -C"
   fi
   # Syntax highlighting and substring search
@@ -126,8 +126,10 @@ if [ -x /usr/bin/ack-grep ] ; then
   alias ack='/usr/bin/ack-grep'
 fi
 
-# Setup PATH for tools
-PATH=${PATH}:${HOME}/bin/tools
+# Got rust?
+if test -d ${HOME}/.cargo/bin ; then
+  PATH=${PATH}:${HOME}/.cargo/bin
+fi
 
 # Most is nice, if we have it
 if command -v most >/dev/null 2>&1; then
@@ -136,3 +138,6 @@ 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}"

dotfiles/zshrc.d/agnoster_prompt/prompt_agnoster_setup

@@ -0,0 +1,173 @@
+# vim:ft=zsh ts=2 sw=2 sts=2
+#
+# agnoster's Theme - https://gist.github.com/3712874
+# A Powerline-inspired theme for ZSH
+#
+# # README
+#
+# In order for this theme to render correctly, you will need a
+# [Powerline-patched font](https://gist.github.com/1595572).
+#
+# In addition, I recommend the
+# [Solarized theme](https://github.com/altercation/solarized/) and, if you're
+# using it on Mac OS X, [iTerm 2](http://www.iterm2.com/) over Terminal.app -
+# it has significantly better color fidelity.
+#
+# # Goals
+#
+# The aim of this theme is to only show you *relevant* information. Like most
+# prompts, it will only show git information when in a git working directory.
+# However, it goes a step further: everything from the current user and
+# hostname to whether the last call exited with an error to whether background
+# jobs are running in this shell will all be displayed automatically when
+# appropriate.
+
+### Segments of the prompt, default order declaration
+
+typeset -aHg AGNOSTER_PROMPT_SEGMENTS=(
+    prompt_status
+    prompt_context
+    prompt_virtualenv
+    prompt_dir
+    prompt_git
+    prompt_end
+)
+
+### Segment drawing
+# A few utility functions to make it easy and re-usable to draw segmented prompts
+
+CURRENT_BG='NONE'
+if [[ -z "$PRIMARY_FG" ]]; then
+	PRIMARY_FG=black
+fi
+
+# Characters
+SEGMENT_SEPARATOR="\ue0b0"
+PLUSMINUS="\u00b1"
+BRANCH="\ue0a0"
+DETACHED="\u27a6"
+CROSS="\u2718"
+LIGHTNING="\u26a1"
+GEAR="\u2699"
+
+# Begin a segment
+# Takes two arguments, background and foreground. Both can be omitted,
+# rendering default background/foreground.
+prompt_segment() {
+  local bg fg
+  [[ -n $1 ]] && bg="%K{$1}" || bg="%k"
+  [[ -n $2 ]] && fg="%F{$2}" || fg="%f"
+  if [[ $CURRENT_BG != 'NONE' && $1 != $CURRENT_BG ]]; then
+    print -n "%{$bg%F{$CURRENT_BG}%}$SEGMENT_SEPARATOR%{$fg%}"
+  else
+    print -n "%{$bg%}%{$fg%}"
+  fi
+  CURRENT_BG=$1
+  [[ -n $3 ]] && print -n $3
+}
+
+# End the prompt, closing any open segments
+prompt_end() {
+  if [[ -n $CURRENT_BG ]]; then
+    print -n "%{%k%F{$CURRENT_BG}%}$SEGMENT_SEPARATOR"
+  else
+    print -n "%{%k%}"
+  fi
+  print -n "%{%f%}"
+  CURRENT_BG=''
+}
+
+### Prompt components
+# Each component will draw itself, and hide itself if no information needs to be shown
+
+# Context: user@hostname (who am I and where am I)
+prompt_context() {
+  local user=`whoami`
+
+  if [[ "$user" != "$DEFAULT_USER" || -n "$SSH_CONNECTION" ]]; then
+    prompt_segment $PRIMARY_FG default " %(!.%{%F{yellow}%}.)$user@%m "
+  fi
+}
+
+# Git: branch/detached head, dirty status
+prompt_git() {
+  local color ref
+  is_dirty() {
+    test -n "$(git status --porcelain --ignore-submodules)"
+  }
+  ref="$vcs_info_msg_0_"
+  if [[ -n "$ref" ]]; then
+    if is_dirty; then
+      color=yellow
+      ref="${ref} $PLUSMINUS"
+    else
+      color=green
+      ref="${ref} "
+    fi
+    if [[ "${ref/.../}" == "$ref" ]]; then
+      ref="$BRANCH $ref"
+    else
+      ref="$DETACHED ${ref/.../}"
+    fi
+    prompt_segment $color $PRIMARY_FG
+    print -n " $ref"
+  fi
+}
+
+# Dir: current working directory
+prompt_dir() {
+  prompt_segment blue $PRIMARY_FG ' %~ '
+}
+
+# Status:
+# - was there an error
+# - am I root
+# - are there background jobs?
+prompt_status() {
+  local symbols
+  symbols=()
+  [[ $RETVAL -ne 0 ]] && symbols+="%{%F{red}%}$CROSS"
+  [[ $UID -eq 0 ]] && symbols+="%{%F{yellow}%}$LIGHTNING"
+  [[ $(jobs -l | wc -l) -gt 0 ]] && symbols+="%{%F{cyan}%}$GEAR"
+
+  [[ -n "$symbols" ]] && prompt_segment $PRIMARY_FG default " $symbols "
+}
+
+# Display current virtual environment
+prompt_virtualenv() {
+  if [[ -n $VIRTUAL_ENV ]]; then
+    color=cyan
+    prompt_segment $color $PRIMARY_FG
+    print -Pn " $(basename $VIRTUAL_ENV) "
+  fi
+}
+
+## Main prompt
+prompt_agnoster_main() {
+  RETVAL=$?
+  CURRENT_BG='NONE'
+  for prompt_segment in "${AGNOSTER_PROMPT_SEGMENTS[@]}"; do
+    [[ -n $prompt_segment ]] && $prompt_segment
+  done
+}
+
+prompt_agnoster_precmd() {
+  vcs_info
+  PROMPT='%{%f%b%k%}$(prompt_agnoster_main) '
+}
+
+prompt_agnoster_setup() {
+  autoload -Uz add-zsh-hook
+  autoload -Uz vcs_info
+
+  prompt_opts=(cr subst percent)
+
+  add-zsh-hook precmd prompt_agnoster_precmd
+
+  zstyle ':vcs_info:*' enable git
+  zstyle ':vcs_info:*' check-for-changes false
+  zstyle ':vcs_info:git*' formats '%b'
+  zstyle ':vcs_info:git*' actionformats '%b (%a)'
+}
+
+prompt_agnoster_setup "$@"

dotfiles/zshrc.d/cnf.zsh

@@ -0,0 +1,4 @@
+# TODO: this is horribly unportable.  Fix it.
+if test -r /etc/zsh_command_not_found && test -r /var/lib/command-not-found/commands.db ; then
+  source /etc/zsh_command_not_found
+fi

dotfiles/zshrc.d/gcloud.zsh

@@ -2,15 +2,16 @@
 
 GCL=${HOME}/tools/gcloud
 
-if [ ! -d ${GCL} ] ; then
-  return
-fi
-
+if [ -d "${GCL}" ] ; then
   # Add bin to path
   export PATH="${PATH}:${GCL}/bin"
 
   # Load completion
-source ${GCL}/completion.zsh.inc
+  source "${GCL}/completion.zsh.inc"
+elif [ -f /usr/share/google-cloud-sdk/completion.zsh.inc ] ; then
+  source /usr/share/google-cloud-sdk/completion.zsh.inc
+fi
+
 
 which kubectl 2>/dev/null >&2 && \
   function kubectl() {

dotfiles/zshrc.d/gpg.zsh

@@ -20,13 +20,19 @@ fi
 # Inform gpg-agent of the current TTY for user prompts.
 export GPG_TTY="$(tty)"
 
-# Integrate with the SSH module.
+# Setup SSH agent support
 if grep '^enable-ssh-support' "$_gpg_agent_conf" &> /dev/null; then
   # Load required functions.
   autoload -Uz add-zsh-hook
 
-  # Override the ssh-agent environment file default path.
-  _ssh_agent_env="$_gpg_agent_env"
+  if test -z "$SSH_AUTH_SOCK" ; then
+    SSH_AUTH_SOCK="/run/user/$(id -u)/gnupg/S.gpg-agent.ssh"
+    if test -S "$SSH_AUTH_SOCK" ; then
+      export SSH_AUTH_SOCK
+    else
+      unset SSH_AUTH_SOCK
+    fi
+  fi
 
   # Updates the GPG-Agent TTY before every command since SSH does not set it.
   function _gpg-agent-update-tty {

dotfiles/zshrc.d/history.zsh

@@ -24,3 +24,11 @@ histmode() {
       ;;
   esac
 }
+
+histsearch() {
+  fc -l -m "${1}" 1
+}
+
+histbrowse() {
+  fc -l 1
+}

dotfiles/zshrc.d/jekyll.zsh

@@ -142,10 +142,10 @@ function jekyll {
       ${EDITOR} "${FILENAME}"
       ;;
     dev)
-      command jekyll serve -D -I "$@"
+      command bundle exec jekyll serve -D -I "$@"
       ;;
     *)
-      command jekyll "$@"
+      command bundle exec jekyll "$@"
       ;;
   esac
 }

dotfiles/zshrc.d/lesshighlight.zsh

@@ -0,0 +1,8 @@
+test -f /usr/share/source-highlight/src-hilite-lesspipe.sh && \
+  function srcless {
+    if [ $# -ne 1 ] ; then
+      echo "$0 <what>" > /dev/stderr
+      return 1
+    fi
+    /usr/share/source-highlight/src-hilite-lesspipe.sh $1 | less -R
+  }

dotfiles/zshrc.d/logging.zsh

@@ -0,0 +1,39 @@
+LOGGER_ENV=""
+LOGGER_DIR="${LOGGER_DIR:-${HOME}/.zlogs}"
+
+function _logger_now {
+  print -P "%D{%Y%m%d-%H%M%S}"
+}
+
+function logenv {
+  LOGGER_ENV="${1:-}"
+  if test -z "${LOGGER_ENV}" ; then
+    return 0
+  fi
+  mkdir -p "${LOGGER_DIR}/${LOGGER_ENV}"
+}
+
+# Executed on prompt
+function _logger_precmd {
+  _RV="$?"
+  if test -z "${LOGGER_ENV}" ; then
+    return 0
+  fi
+  _LOGGER_STOP="$(_logger_now)"
+  _LOGGER_DATE="$(print -P '%D{%Y%m%d}')"
+  echo "$_LOGGER_START $_LOGGER_STOP $$ $_RV $_LOGGER_CMD" >>| \
+    "${LOGGER_DIR}/${LOGGER_ENV}/${_LOGGER_DATE}.log"
+  return 0
+}
+
+# Executed on command entry
+function _logger_preexec {
+  _LOGGER_CMD="${2}"
+  _LOGGER_START="$(_logger_now)"
+  return 0
+}
+
+typeset -a precmd_functions
+precmd_functions+=_logger_precmd
+typeset -a preexec_functions
+preexec_functions+=_logger_preexec

dotfiles/zshrc.d/matir_prompt/prompt_matir_setup

@@ -49,7 +49,7 @@ zle -N zle-keymap-select
 zle -N zle-line-init zle-keymap-select
 
 function prompt_matir_precmd {
-  vcs_info
+  vcs_info 2>/dev/null
   if [ $VIRTUAL_ENV ] ; then
     VIRTUAL_ENV_SHORT=" (py:$(basename $VIRTUAL_ENV))"
   else

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

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

dotfiles/zshrc.d/usage.zsh

@@ -0,0 +1,3 @@
+function duf {
+     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

@@ -275,6 +275,25 @@ install_chrome() {
   rm -rf ${TMPD}
 }
 
+setup_git_email() {
+  local gc_local="${HOME}/.gitconfig.local"
+  if test -f "${gc_local}" ; then
+    return 0
+  fi
+  if [ "${USER:0:5}" != "david" ] ; then
+    return 0
+  fi
+  local domain="$(hostname -f | egrep -o '[a-z0-9-]+\.[a-z0-9-]+$')"
+  case $(echo ${domain} | md5sum | awk '{print $1}') in
+    b21a24d528346ef7d3932306ed96ede5|a5ed434a3f5089b489576cceab824f25)
+      ;;
+    *)
+      return 0
+      ;;
+  esac
+  echo -e "[user]\n    email=${USER}@${domain}" > "${gc_local}"
+}
+
 read_saved_prefs() {
   # Can't use basedir here as we don't have it yet
   local old_pref_file=$(dirname $0)/installed-prefs
@@ -337,9 +356,9 @@ install_dotfiles() {
 
 install_main() {
   test -d ${BASEDIR}/.git && command -v git >/dev/null 2>&1 && \
-    git -C ${BASEDIR} pull
-  test $MINIMAL = 1 || command -v git >/dev/null 2>&1 && \
-    git -C ${BASEDIR} submodule update --init --recursive
+    git -C ${BASEDIR} pull --ff-only
+  test $MINIMAL = 1 || ( command -v git >/dev/null 2>&1 && \
+    git -C ${BASEDIR} submodule update --init --recursive )
   test $MINIMAL = 1 || prerequisites
   test $INSTALL_PKGS = 1 && is_deb_system && install_apt_pkgs
   install_dotfiles
@@ -347,6 +366,7 @@ install_main() {
   test $MINIMAL = 1 || postinstall
   test $INSTALL_KEYS = 1 && install_keys
   save_prefs
+  setup_git_email
   cleanup
 }
 

packages.X

@@ -1,10 +1,13 @@
 audacity
 cinnamon
 codequery
+flameshot
 fonts-inconsolata
+fonts-powerline
 gimp
 keepassx
 network-manager-openvpn-gnome
+solaar
 vim-gtk
 wireshark
 wkhtmltopdf

packages.cli

@@ -37,6 +37,7 @@ radare2
 scapy
 scdaemon
 socat
+source-highlight
 sqlite3
 ufw
 zsh-syntax-highlighting

packages.fonts

@@ -2,6 +2,7 @@ fonts-anonymous-pro
 fonts-dejavu
 fonts-dseg
 fonts-elusive-icons
+fonts-firacode
 fonts-font-awesome
 fonts-freefont-otf
 fonts-hack
@@ -14,6 +15,7 @@ fonts-ocr-a
 fonts-ocr-b
 fonts-open-sans
 fonts-oxygen
+fonts-powerline
 fonts-roboto
 fonts-stix
 fonts-ubuntu

sysctl/userns.conf

@@ -0,0 +1 @@
+kernel.unprivileged_userns_clone=1

udev/99-usb-trim.rules

@@ -0,0 +1 @@
+ACTION=="add|change", ATTRS{idVendor}=="2109", ATTRS{idProduct}=="0715", SUBSYSTEM=="scsi_disk", ATTR{provisioning_mode}="unmap"