diff --git a/plugins/available/blesh.plugin.bash b/plugins/available/blesh.plugin.bash index 6acd19ff9d..083f31ae57 100644 --- a/plugins/available/blesh.plugin.bash +++ b/plugins/available/blesh.plugin.bash @@ -11,6 +11,10 @@ _bash_it_ble_path=${XDG_DATA_HOME:-$HOME/.local/share}/blesh/ble.sh if [[ -f $_bash_it_ble_path ]]; then # shellcheck disable=1090 source "$_bash_it_ble_path" --attach=prompt + if _bash-it-component-item-is-enabled plugin fzf; then + ble-import -d integration/fzf-key-bindings + ble-import -d integration/fzf-completion + fi else _log_error "Could not find ble.sh in $_bash_it_ble_path" _log_error "Please install using the following command:" diff --git a/plugins/available/fzf.plugin.bash b/plugins/available/fzf.plugin.bash index 8bb6b63fcb..e6f66676a4 100644 --- a/plugins/available/fzf.plugin.bash +++ b/plugins/available/fzf.plugin.bash @@ -5,13 +5,15 @@ cite about-plugin about-plugin 'load fzf, if you are using it' -if [ -r ~/.fzf.bash ]; then - # shellcheck disable=SC1090 - source ~/.fzf.bash -elif [ -r "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.bash ]; then - # shellcheck disable=SC1091 - source "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.bash -fi +if ! _bash-it-component-item-is-enabled plugin blesh; then + if [ -r ~/.fzf.bash ]; then + # shellcheck disable=SC1090 + source ~/.fzf.bash + elif [ -r "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.bash ]; then + # shellcheck disable=SC1091 + source "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.bash + fi +fi # only sources the keybindings and integration if blesh is not integrated already # No need to continue if the command is not present _command_exists fzf || return diff --git a/plugins/available/history-eternal.plugin.bash b/plugins/available/history-eternal.plugin.bash index 829868df4a..26bea839e4 100644 --- a/plugins/available/history-eternal.plugin.bash +++ b/plugins/available/history-eternal.plugin.bash @@ -10,13 +10,13 @@ fi # truncating the history file early. # "Numeric values less than zero result in every command being saved on the history list (there is no limit)" -readonly HISTSIZE=-1 2> /dev/null || true +HISTSIZE=-1 2> /dev/null || true # "Non-numeric values and numeric values less than zero inhibit truncation" -readonly HISTFILESIZE='unlimited' 2> /dev/null || true +HISTFILESIZE='unlimited' 2> /dev/null || true # Use a custom history file location so history is not truncated # if the environment ever loses this "eternal" configuration. HISTDIR="${XDG_STATE_HOME:-${HOME?}/.local/state}/bash" [[ -d ${HISTDIR?} ]] || mkdir -p "${HISTDIR?}" -readonly HISTFILE="${HISTDIR?}/history" 2> /dev/null || true +HISTFILE="${HISTDIR?}/history" 2> /dev/null || true