Merge branch 'master' of git.nixy.moe:nixy/dotfiles

bash/.bashrc

@@ -130,6 +130,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

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"