Merge branch 'main' of github.com:Matir/skel

bin/install_tool

@@ -110,6 +110,14 @@ 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
+}
+
 # Begin main tool selection
 case ${TOOL} in
   john)
@@ -323,6 +331,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 \
@@ -370,7 +379,7 @@ 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
@@ -379,19 +388,19 @@ EOF
     fi
     ;;
   gron)
-    go get -u github.com/tomnomnom/gron
+    go install github.com/tomnomnom/gron@latest
     ;;
   httprobe)
-    go get -u github.com/tomnomnom/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/v3/...
+    go install github.com/OWASP/Amass/v3/...
     ;;
   cht.sh)
     install_pkgs rlwrap
@@ -401,8 +410,8 @@ EOF
     add_bin_symlink cht.sh
     ;;
   age)
-    go get -u filippo.io/age/cmd/age
+    go install filippo.io/age/cmd/age@latest
-    go get -u filippo.io/age/cmd/age-keygen
+    go install filippo.io/age/cmd/age-keygen@latest
     ;;
   docker-compose)
     mkdir -p ${DESTDIR}
@@ -433,6 +442,7 @@ EOF
     cargo install bottom
     ;;
   delta)
+    deb_only
     if ! check_sudo ; then
       echo "Must be able to run as sudo."
       exit 1
@@ -492,6 +502,17 @@ EOF
     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
+    ;;
   *)
     echo "Unknown tool: ${TOOL}" >/dev/stderr
     list_tools

bin/setup/nerdfonts.sh

@@ -2,24 +2,25 @@
 
 set -ue
 
-FONTS=(
+VER="v2.2.2"
-  https://github.com/ryanoasis/nerd-fonts/releases/download/v2.2.2/DejaVuSansMono.zip
-  https://github.com/ryanoasis/nerd-fonts/releases/download/v2.2.2/FiraCode.zip
-  https://github.com/ryanoasis/nerd-fonts/releases/download/v2.2.2/FiraMono.zip
-  https://github.com/ryanoasis/nerd-fonts/releases/download/v2.2.2/Hack.zip
-  https://github.com/ryanoasis/nerd-fonts/releases/download/v2.2.2/Inconsolata.zip
-  https://github.com/ryanoasis/nerd-fonts/releases/download/v2.2.2/OpenDyslexic.zip
-)
 
-echo ${FONTS}
+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
-  echo ${f}
   BN=$(basename $f)
   wget -O ${FPATH}/${BN} ${f}
   unzip -o -d ${FPATH} ${FPATH}/${BN}
 done
+
+fc-cache -v

dotfiles/aliases

@@ -56,3 +56,6 @@ 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)'

dotfiles/profile

@@ -34,4 +34,9 @@ if [ -z "${LIBVIRT_DEFAULT_URI}" ] ; then
   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

@@ -10,35 +10,36 @@
 .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
-.rvm*
+.platformio
 .rustup
+.rvm*
 .sliver
 .sqlite_history
 .thumbnails
 .virtualenvs
 .wine
+.xsession-errors*
 .zcompdump
 .zcompdump*
 Audits
 Downloads
 SpiderOak Hive
+Unity
 VirtualBox VMs
 tmp
 tools
-.minikube
-.config/unity3d/cache
-.xsession-errors*
-.config/google-chrome-beta
-.config/google-chrome
-Unity

dotfiles/vimrc

@@ -154,10 +154,15 @@ nnoremap <silent> <F5> :SyntasticCheck<CR> :Errors<CR>
 " Currently only works on debian-based systems...
 " It also does not play nicely with virtual envs, so we skip it then
 if isdirectory("/usr/share/vim-youcompleteme") && empty($VIRTUAL_ENV)
-  let g:ycm_gopls_binary_path='gopls'
-  let g:ycm_autoclose_preview_window_after_insertion=1
   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

keys/ssh/id_ecdsa_chromebook.pub

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

keys/ssh/id_ecdsa_scar.pub

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

keys/ssh/id_ed25519_wfh_chromebox.pub

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