Update nerdfonts

Requires updating symlinks.

Fixes #13.

bin/install_tool

@@ -154,7 +154,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
@@ -229,10 +229,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
@@ -285,7 +302,7 @@ case ${TOOL} in
   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 \
@@ -433,6 +450,15 @@ EOF
   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 \
@@ -441,6 +467,31 @@ EOF
     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
+    ;;
   *)
     echo "Unknown tool: ${TOOL}" >/dev/stderr
     list_tools

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,6 @@ 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"

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/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/xfwm4.xml

@@ -2,7 +2,7 @@
 
 <channel name="xfwm4" version="1.0">
   <property name="general" type="empty">
-    <property name="activate_action" type="string" value="bring"/>
+    <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"/>
@@ -77,7 +77,7 @@
     <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="true"/>
+    <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"/>

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'

dotfiles/rsync_ignore

@@ -2,19 +2,31 @@
 .Genymobile
 .Ticket to Ride*
 .android*
+.ansible
 .arduino*
+.aws
 .bundle
 .cache
+.cargo
+.config/discord
+.config/gcloud/logs
 .dropbox-dist
+.gnupg.bak
 .gradle
 .histfile
+.kube/cache
 .local/share/Steam
 .local/share/Trash
 .local/lib
+.m2
+.npm
+.p2
 .rvm*
+.rustup
 .sliver
 .sqlite_history
 .thumbnails
+.virtualenvs
 .wine
 .zcompdump
 .zcompdump*

dotfiles/shenv

@@ -81,5 +81,8 @@ export LC_COLLATE=C
 # Opt out of .net telemetry
 export DOTNET_CLI_TELEMETRY_OPTOUT=1
 
+# Suppress lvm warnings
+export LVM_SUPPRESS_FD_WARNINGS=1
+
 # shellcheck source=/dev/null
 test -e "$HOME/.localenv" && . "$HOME/.localenv"

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,6 +106,8 @@ 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=auto -C"
@@ -155,4 +158,7 @@ fi
 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

@@ -6,3 +6,12 @@ if ! command -v bat >/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

@@ -2,8 +2,22 @@ function dumpenv {
   tr '\0' '\n' < /proc/${1}/environ
 }
 
-if test -x "${HOME}/tools/starship/starship" ; then
+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

dotfiles/zshrc.d/rvm.zsh

@@ -0,0 +1 @@
+[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm"

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_zazu.pub

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

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"