From f72d1050d3574a29a4fe4d30d85bf160490c109b Mon Sep 17 00:00:00 2001
From: anmiller <anmiller@penguinrandomhouse.com>
Date: Fri, 3 Jan 2025 18:07:30 +0000
Subject: [PATCH 1/3] Add python + LSP + gitlab-ci-local tool

---
 installers/install-nix-packages-flake.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/installers/install-nix-packages-flake.sh b/installers/install-nix-packages-flake.sh
index 65a3b15..37a2b00 100755
--- a/installers/install-nix-packages-flake.sh
+++ b/installers/install-nix-packages-flake.sh
@@ -11,7 +11,6 @@ nix_packages=(
   "jq"
   "yq"
 
-  "ruby"
   "shellcheck"
 
   # Neovim + Plugin dependencies
@@ -24,9 +23,12 @@ nix_packages=(
   "yaml-language-server" # Yaml
   "lua-language-server" # Lua
   "solargraph" # Ruby
+  "python3Packages.python-lsp-server" # Python
   
   # ProgrammingLanguages
   "lua52Packages.lua"
+  "ruby"
+  "python3"
 
   "pass"
   "gnupg"
@@ -40,6 +42,7 @@ nix_packages=(
   "kubectl"
   "kubernetes-helm"
   "rancher"
+  "gitlab-ci-local"
 
   # Remote programming tools
   "lemonade"

From b3cecbaf2286ea6f460ac9a03845d7e0cc60094f Mon Sep 17 00:00:00 2001
From: anmiller <anmiller@penguinrandomhouse.com>
Date: Fri, 17 Jan 2025 20:03:16 +0000
Subject: [PATCH 2/3] Improve Xtrace by hiding output of prompt commands

---
 bash/.bashrc | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/bash/.bashrc b/bash/.bashrc
index 18319d3..534c0c0 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -116,6 +116,23 @@ if [ -f "$HOME/.private_functions" ] && [ -r "$HOME/.private_functions" ]; then
   . "$HOME/.private_functions"
 fi
 
+# Preserve the usefulness of set -x by attempting to hide everything that
+# happens in prompt_command
+preserve_xtrace() {
+  if grep -q "x" <<< $-; then
+    XTRACE_WAS_SET=1
+    set +x
+  fi
+} 2>/dev/null
+preserve_xtrace_reset() {
+  if [ "${XTRACE_WAS_SET}" ]; then
+    set -x
+    unset XTRACE_WAS_SET
+  fi
+} 2>/dev/null
+
+PROMPT_COMMAND="preserve_xtrace; $PROMPT_COMMAND; preserve_xtrace_reset"
+
 if $(which direnv &> /dev/null); then
   eval "$(direnv hook bash)"
 fi

From 27d202b0c26c0d490d2fa8c9356ed27275f42ee7 Mon Sep 17 00:00:00 2001
From: anmiller <anmiller@penguinrandomhouse.com>
Date: Tue, 21 Jan 2025 21:20:42 +0000
Subject: [PATCH 3/3] Fix .bashrc

---
 bash/.bashrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bash/.bashrc b/bash/.bashrc
index 534c0c0..da13996 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -131,7 +131,7 @@ preserve_xtrace_reset() {
   fi
 } 2>/dev/null
 
-PROMPT_COMMAND="preserve_xtrace; $PROMPT_COMMAND; preserve_xtrace_reset"
+PROMPT_COMMAND="preserve_xtrace; $PROMPT_COMMAND preserve_xtrace_reset"
 
 if $(which direnv &> /dev/null); then
   eval "$(direnv hook bash)"