diff --git a/_home/dot_bashrc b/_home/dot_bashrc index 13ebe78..52e331e 100644 --- a/_home/dot_bashrc +++ b/_home/dot_bashrc @@ -16,9 +16,9 @@ [ -z "${DBG_SHRC}" ] || echo "Exiting .bashrc" # This will prevent atuin's setup script from adding itself: atuin init bash -#eval "${SZ_ENV_BASH_LOAD_PREEXEC}" -#if [[ -n "${BLE_VERSION-}" ]]; then -# [[ -n "${DBG}" ]] && echo "attaching ble.sh" -# ble-attach -#fi +eval "${SZ_ENV_BASH_LOAD_PREEXEC}" +if [[ -n "${BLE_VERSION-}" ]]; then + [[ -n "${DBG}" ]] && echo "attaching ble.sh" + ble-attach +fi diff --git a/_home/private_dot_config/sz.env/ID_truenas_scale.env b/_home/private_dot_config/sz.env/ID_truenas_scale.env deleted file mode 100644 index 8aa90e1..0000000 --- a/_home/private_dot_config/sz.env/ID_truenas_scale.env +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env -S bash -c 'echo "Not a user script. source(aka .) only"' - -function is_truenas() { - local TRUENAS_TARGET="truenas.target" - [ "$(systemctl get-default)" = "$TRUENAS_TARGET" ] \ - && [ "$(systemctl is-active "$TRUENAS_TARGET")" = "active" ] -} - diff --git a/_home/private_dot_config/sz.env/PATH_truestuff.env b/_home/private_dot_config/sz.env/PATH_truestuff.env index 88e9bea..2178998 100644 --- a/_home/private_dot_config/sz.env/PATH_truestuff.env +++ b/_home/private_dot_config/sz.env/PATH_truestuff.env @@ -1,6 +1,6 @@ #!/usr/bin/env -S bash -c 'echo "Not a user script. source(aka .) only"' -if is_truenas && is_cmd midclt && [ -z "$SCALE_POOL" ]; then +if is_cmd midclt; then export SCALE_POOL="$(midclt call "kubernetes.config" 2>/dev/null | jq -r '.pool')" [ -d "/mnt/$SCALE_POOL" ] || unset SCALE_POOL fi diff --git a/_home/private_dot_config/sz.env/executable__.load.sh b/_home/private_dot_config/sz.env/executable__.load.sh index c32c27a..5ad2e54 100644 --- a/_home/private_dot_config/sz.env/executable__.load.sh +++ b/_home/private_dot_config/sz.env/executable__.load.sh @@ -48,14 +48,11 @@ if is_sourced; then # The following constructs a list of load_next ... commands ALL_ENV_FILES="$( find ~/.config/sz.env -xdev -type d -not -name '*.off' \ - -exec sh -c ' - find "$1" -xdev -maxdepth 1 -type f -name "ID_*.env" | sort - ' shell '{}' ';' \ -exec sh -c ' find "$1" -xdev -maxdepth 1 -type f -name "PATH_*.env" | sort ' shell '{}' ';' \ -exec sh -c ' - find "$1" -xdev -maxdepth 1 -type f -name "*.env" -not -name "ID_*" -not -name "PATH_*" -print | sort + find "$1" -xdev -maxdepth 1 -type f -name "*.env" -not -name "PATH_*" -print | sort ' shell '{}' ';' \ | sed -e 's/^/load_next "/; s/$/";/' )" diff --git a/_home/private_dot_config/sz.env/zzz_bash_post.env b/_home/private_dot_config/sz.env/zzz_bash_post.env deleted file mode 100644 index 9139b36..0000000 --- a/_home/private_dot_config/sz.env/zzz_bash_post.env +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env -S bash -c 'echo "Not a user script. source(aka .) only"' - -BASE_SHELL=${BASE_SHELL:-${SHELL##*/}} - -if [[ "${BASE_SHELL}" == "bash" ]]; then - eval "${SZ_ENV_BASH_LOAD_PREEXEC}" - if [[ -n "${BLE_VERSION-}" ]]; then - [[ -n "${DBG}" ]] && echo "attaching ble.sh" - ble-attach - fi -fi - diff --git a/_home/private_dot_local/bin/executable_load-zellij b/_home/private_dot_local/bin/executable_load-zellij index 90d7608..3d6ab54 100644 --- a/_home/private_dot_local/bin/executable_load-zellij +++ b/_home/private_dot_local/bin/executable_load-zellij @@ -22,10 +22,9 @@ if is_sourced; then } zellij() { if [[ ! -x ~/bin/zellij ]]; then - if [[ -x $HOME/.cache/chezmoi/tmp/zellij/zellij ]]; then + if [[ -r $HOME/.cache/chezmoi/tmp/zellij/zellij ]]; then ln --symbolic --relative $HOME/.cache/chezmoi/tmp/zellij/zellij ~/bin elif [[ ! -x /tmp/zellij/bootstrap/zellij ]]; then - printf "Grabbing zellij from the web!\n" bash <(curl -sL zellij.dev/launch) "${@}" && return fi fi