Compare commits

..

No commits in common. "27d202b0c26c0d490d2fa8c9356ed27275f42ee7" and "6d2ebcb505e08d9f67bc2641f5608d5a2a47b474" have entirely different histories.

2 changed files with 1 additions and 21 deletions

View File

@ -116,23 +116,6 @@ if [ -f "$HOME/.private_functions" ] && [ -r "$HOME/.private_functions" ]; then
. "$HOME/.private_functions" . "$HOME/.private_functions"
fi 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 if $(which direnv &> /dev/null); then
eval "$(direnv hook bash)" eval "$(direnv hook bash)"
fi fi

View File

@ -11,6 +11,7 @@ nix_packages=(
"jq" "jq"
"yq" "yq"
"ruby"
"shellcheck" "shellcheck"
# Neovim + Plugin dependencies # Neovim + Plugin dependencies
@ -23,12 +24,9 @@ nix_packages=(
"yaml-language-server" # Yaml "yaml-language-server" # Yaml
"lua-language-server" # Lua "lua-language-server" # Lua
"solargraph" # Ruby "solargraph" # Ruby
"python3Packages.python-lsp-server" # Python
# ProgrammingLanguages # ProgrammingLanguages
"lua52Packages.lua" "lua52Packages.lua"
"ruby"
"python3"
"pass" "pass"
"gnupg" "gnupg"
@ -42,7 +40,6 @@ nix_packages=(
"kubectl" "kubectl"
"kubernetes-helm" "kubernetes-helm"
"rancher" "rancher"
"gitlab-ci-local"
# Remote programming tools # Remote programming tools
"lemonade" "lemonade"