From e4b311a6c8e14a9db6f5d3cae3e294fb2ad24921 Mon Sep 17 00:00:00 2001
From: Darren 'Tadgy' Austin <darren@afterdark.org.uk>
Date: Sat, 24 Aug 2024 02:38:31 +0100
Subject: [PATCH] Sync minimal branch with master.

---
 .bash_logout       |  2 +-
 .bashrc            |  2 +-
 .config/.gitignore |  1 +
 .config/bat/config | 24 ++++++++++++++++++++++++
 .gitignore         |  8 +++-----
 .ssh/config        |  6 +++++-
 6 files changed, 35 insertions(+), 8 deletions(-)
 create mode 100644 .config/bat/config

diff --git a/.bash_logout b/.bash_logout
index 6eb6716..f59c34b 100644
--- a/.bash_logout
+++ b/.bash_logout
@@ -16,7 +16,7 @@ fi
 hash ssh-add ssh-agent >/dev/null 2>&1 && {
   # Stop any started ssh-agent as long as the shell level is 1 and we're not on a tty.
   (( SHLVL == 1 )) && [[ "$(tty)" != /dev/tty* ]] && [[ -n "$SSH_AGENT_PID" ]] && {
-    eval "$(ssh-agent -k >/dev/null 2>&1)" >/dev/null || printf "\\033[1;31;40m%s\\033[0;39m\\n" "Failed to stop ssh-agent." >&2
+    eval "$(ssh-agent -k >/dev/null 2>&1)" >/dev/null || printf "\\033[1;31;40m%s\\033[0m\\n" "Failed to stop ssh-agent." >&2
   }
 
   # Update the ~/.ssh/agents file.
diff --git a/.bashrc b/.bashrc
index cb530f5..69c11c7 100644
--- a/.bashrc
+++ b/.bashrc
@@ -177,7 +177,7 @@ __git_prompt_command() {
   [[ "${GIT_REPO_INFO[0]}" == "true" ]] && {
     # Run prefetch tasks if not disabled.
     [[ -z "$GIT_DISABLE_PROMPT_PREFETCH" ]] && [[ "$(git config --local --get --type bool script.DisablePromptPrefetch 2>/dev/null)" != "true" ]] && {
-      git maintenance run --task=prefetch 2>/dev/null || {
+      timeout --signal=KILL 7s git maintenance run --task=prefetch 2>/dev/null || {
         printf "\\033[1;31m%s\\033[0m\\n" "Git maintenance 'prefetch' task failed." >&2
         return 1
       }
diff --git a/.config/.gitignore b/.config/.gitignore
index 3062d59..11fd3c2 100644
--- a/.config/.gitignore
+++ b/.config/.gitignore
@@ -7,5 +7,6 @@
 /libreoffice/
 /libvirt/
 /mimeapps.list
+/ookla/
 /pulse/
 /xfce4/
diff --git a/.config/bat/config b/.config/bat/config
new file mode 100644
index 0000000..566868d
--- /dev/null
+++ b/.config/bat/config
@@ -0,0 +1,24 @@
+# Don't add header, lines or table layout - just plain coloured output.
+--style=plain
+
+# Specify desired highlighting theme (e.g. "TwoDark"). Run `bat --list-themes`
+# for a list of all available themes
+#--theme="TwoDark"
+
+# Enable this to use italic text on the terminal. This is not supported on all
+# terminal emulators (like tmux, by default):
+#--italic-text=always
+
+# Uncomment the following line to disable automatic paging:
+#--paging=never
+
+# Uncomment the following line if you are using less version >= 551 and want to
+# enable mouse scrolling support in `bat` when running inside tmux. This might
+# disable text selection, unless you press shift.
+#--pager="less --RAW-CONTROL-CHARS --quit-if-one-screen --mouse"
+
+# Syntax mappings: map a certain filename pattern to a language.
+#   Example 1: use the C++ syntax for Arduino .ino files
+#   Example 2: Use ".gitignore"-style highlighting for ".ignore" files
+#--map-syntax "*.ino:C++"
+#--map-syntax ".ignore:Git Ignore"
diff --git a/.gitignore b/.gitignore
index 669ad2b..f2e8acd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,15 +8,12 @@
 /.Xauthority*
 /.ab*
 /.alpine-smime/
+/.ansible/
 /.aspell.*
 /.bash_history*
 /.cache/
 /.cups/
 /.dbus/
-/.esxcli-esx0
-/.esxcli-esx1
-/.esxcli-esx2
-/.esxcli-esx3
 /.fltk/
 /.gitconfig
 /.gvfs/
@@ -28,12 +25,13 @@
 /.pki/
 /.rnd
 /.screen-*/
-/.selected_editor
 /.sqlite_history
+/.terraform.d/
 /.thumbnails/
 /.viminfo
 /.vmware/
 /.vnc/
+/.wine/
 /.wget-hsts
 /.xca/
 /.xsession-errors*
diff --git a/.ssh/config b/.ssh/config
index 738e162..9b2246b 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -14,7 +14,7 @@ VerifyHostKeyDNS		yes
 VisualHostKey			yes
 
 # Only forward the gpg-agent socket if it exists on the local host.
-Match exec "[[ -e ${HOME}/.gnupg/S.gpg-agent  ]]"
+Match exec "[[ -e ${HOME}/.gnupg/S.gpg-agent  ]]" host !*.coventry,!*.appliansys.com,!*.appliansys.net
   RemoteForward			%d/.gnupg/S.gpg-agent	${HOME}/.gnupg/S.gpg-agent
 
 # Home stuff.
@@ -72,3 +72,7 @@ Host github.com git.rlworkman.net
 Host zapp zapp.opensourcerers.net
   Hostname			zapp.opensourcerers.net
   Port				9922
+
+Host esx.support.coventry vidar.coventry
+  User root
+  HostKeyAlgorithms ssh-rsa