Improvements from setting up a build server

.gitignore

@@ -7,8 +7,8 @@ stowdir/.vim/undo
 stowdir/.vim/viminfo
 stowdir/.vim/bundle/vis/doc/tags
 
-# Allow adding work-specific aliases without tracking them.
-bashrc.d/100-work.sh
+# Allow adding work or host specific tweaks without tracking them.
+bashrc.d/1*.sh
 
 # Byte-compiled / optimized / DLL files
 __pycache__/

bashrc.d/060-ps1.sh

@@ -89,6 +89,8 @@ fi
 
 ##################################################################################################
 # Add the __git_ps1 from /usr/share/git-core/contrib/completion/git-prompt.sh
+#
+# This moved to /usr/lib/git-core/git-sh-prompt in recent systems.
 ##################################################################################################
 function_exists() {
     declare -f -F "$1" >/dev/null

setup.d/020-fancy-tools.sh

@@ -49,41 +49,4 @@ if prompt_default_yes "Install/update fancy shell tools?"; then
             download_and_install_delta "$latest_version"
         fi
     fi
-
-    download_and_install_qsv() {
-        local version="$1"
-        local artifact="qsv-$version-x86_64-unknown-linux-gnu.zip"
-        pushd /tmp || exit
-        debug "downloading $artifact ..."
-        github_download_release "jqnatividad/qsv" "$version" "$artifact"
-        debug "unpacking $artifact ..."
-        unzip -d qsv "$artifact"
-        debug "installing ..."
-        cp qsv/qsv ~/.local/bin/
-
-        popd || exit 1
-    }
-
-    if prompt_default_yes "Install/update qsv from GitHub"; then
-        latest_version=$(github_latest_release_tag "jqnatividad/qsv")
-        info "Found latest version: $latest_version"
-
-        if command -v qsv &>/dev/null; then
-            installed_version=$(qsv --version | sed -En 's/^qsv ([0-9]+\.[0-9]+\.[0-9]+).*$/\1/p')
-            debug "Found installed version: $installed_version"
-            if [[ "$installed_version" != "$latest_version" ]]; then
-                info "Updating qsv ..."
-                download_and_install_qsv "$latest_version"
-            else
-                info "qsv $latest_version already installed"
-                if prompt_default_no "Reinstall qsv?"; then
-                    info "Reinstalling qsv ..."
-                    download_and_install_qsv "$latest_version"
-                fi
-            fi
-        else
-            info "Installing qsv for the first time..."
-            download_and_install_qsv "$latest_version"
-        fi
-    fi
 fi

stowdir/.local/bin/busylightd

@@ -96,7 +96,6 @@ class BusylightMonitor:
     """Monitor Teams status and update Busylight accordingly."""
 
     def __init__(self, mqtt_config: Dict):
-        self.client: mqtt.Client = self.connect_mqtt(mqtt_config)
         self.status = "unknown"
         self.light: Optional[Light] = None
 
@@ -106,6 +105,8 @@ class BusylightMonitor:
         self.observer = pyudev.MonitorObserver(monitor, callback=self.on_usb_event, name="udev-mon")
         self.observer.daemon = False
 
+        self.client: mqtt.Client = self.connect_mqtt(mqtt_config)
+
     def connect_mqtt(self, config: Dict) -> mqtt.Client:
         """Connect to the MQTT broker with the given configs."""
         client = mqtt.Client(mqtt.CallbackAPIVersion.VERSION2)

stowdir/.local/bin/uhist

@@ -17,11 +17,9 @@ COMMAND_WRAPPERS = {
     "time",
 }
 
-BASH_HISTORY = expanduser("~/.bash_history")
-
 
 def get_subcommands(command):
-    """Takes the root, or root + subcommand if indicated by MULTI_COMMAND_COMMANDS."""
+    """Take the root, or root + subcommand if indicated by MULTI_COMMAND_COMMANDS."""
     if not command:
         return ""
 
@@ -37,9 +35,10 @@ def get_subcommands(command):
     return root
 
 
-def main(n):
-    """Analyze and print statistics about ~/.bash_history"""
-    with open(BASH_HISTORY, "r") as history:
+def main(file, n):
+    """Analyze and print statistics about ~/.bash_history."""
+    file = expanduser(file)
+    with open(file, "r") as history:
         history = Counter(get_subcommands(c.split()) for c in history)
         total = sum(history.values())
 
@@ -49,6 +48,7 @@ def main(n):
 
 if __name__ == "__main__":
     parser = argparse.ArgumentParser()
+    parser.add_argument("input", default="~/.bash_history", help="The bash history file to analyze")
     parser.add_argument(
         "-n",
         "--number",
@@ -58,4 +58,4 @@ if __name__ == "__main__":
     )
 
     args = parser.parse_args()
-    main(args.number)
+    main(args.input, args.number)

stowdir/.local/bin/vim

@@ -1,4 +1,8 @@
 #!/bin/bash
 
 # The Fedora vim package doesn't include the clipboard features I want, so use gvim instead
-exec gvim -v "$@"
+if command -v gvim >/dev/null 2>&1; then
+    exec gvim -v "$@"
+else
+    exec /usr/bin/vim -v "$@"
+fi

stowdir/.tmux.conf

@@ -53,6 +53,19 @@ bind-key -n C-Right select-window -t +1
 ###################################################################################################
 bind-key r source-file ~/.tmux.conf \; display-message "~/.tmux.conf reloaded"
 
+bind -T root F12 \
+    set prefix None \; \
+    display-message "disabled (F12 to enable)" \; \
+    set key-table off \; \
+    set status-style bg=yellow \; \
+    refresh-client -S
+
+bind -T off F12 \
+    set -u prefix \; \
+    set -u key-table \; \
+    set -u status-style \; \
+    refresh-client -S
+
 set -g prefix C-a
 bind-key C-a send-prefix