Merge branch 'master' into alias/general

Author: seefood

.github/workflows/ci.yml

@@ -7,7 +7,7 @@ jobs:
   bats-test:
     strategy:
       matrix:
-        os: [ubuntu-20.04, ubuntu-24.04, macos-14]
+        os: [ubuntu-24.04, macos-14]
 
     runs-on: ${{ matrix.os }}
 

.gitignore

@@ -22,3 +22,5 @@ tmp/
 profiles/*
 # apart from the default one
 !profiles/default.bash_it
+
+/vendor/github.com/nojhan/liquidprompt

aliases/available/general.aliases.bash

@@ -35,12 +35,12 @@ if _command_exists pianobar; then
 	alias piano='pianobar'
 fi
 
-alias ..='cd ..'                     # Go up one directory
-alias cd..='cd ..'                   # Common misspelling for going up one directory
-alias ...='cd ../..'                 # Go up two directories
-alias ....='cd ../../..'             # Go up three directories
-alias -- -='cd -'                    # Go back
-alias dow='cd /home/$USER/Downloads' # Go to the Downloads directory
+alias ..='cd ..'               # Go up one directory
+alias cd..='cd ..'             # Common misspelling for going up one directory
+alias ...='cd ../..'           # Go up two directories
+alias ....='cd ../../..'       # Go up three directories
+alias -- -='cd -'              # Go back
+alias dow='cd $HOME/Downloads' # Go to the Downloads directory
 
 # Shell History
 alias h='history'

aliases/available/git-omz.aliases.bash

@@ -0,0 +1,34 @@
+# shellcheck shell=bash
+cite 'about-alias'
+about-alias 'git aliases from oh-my-zsh (incompatible with regular git aliases option)'
+
+if _bash-it-component-item-is-enabled aliases git; then
+	_log_warning "git-omz aliases are incompatible with regular git aliases"
+	return 1
+fi
+
+# Load after regular git aliases
+# BASH_IT_LOAD_PRIORITY: 160
+
+# Setup git version
+read -ra git_version_arr <<< "$(git version 2> /dev/null)"
+# shellcheck disable=SC2034
+git_version="${git_version_arr[2]}"
+
+# Setup is-at-least
+function is-at-least {
+	local expected_version=$1
+	local actual_version=$2
+	local versions
+
+	printf -v versions '%s\n%s' "$expected_version" "$actual_version"
+	[[ $versions = "$(sort -V <<< "$versions")" ]]
+}
+
+# Setup git_current_branch
+function git_current_branch {
+	_git-branch
+}
+
+# shellcheck disable=SC1090
+source "${BASH_IT}"/vendor/github.com/ohmyzsh/ohmyzsh/plugins/git/git.plugin.zsh

aliases/available/git.aliases.bash

@@ -1,9 +1,15 @@
 # shellcheck shell=bash
 about-alias 'common git abbreviations'
 
+# We can use this variable to make sure that we don't accidentally clash with git-zsh aliases
+if _bash-it-component-item-is-enabled aliases git-omz; then
+	_log_warning "The aliases from 'git' and from 'git-omz' conflict with each other; please only enable one."
+	return 1
+fi
+
 alias g='git'
 alias get='git'
-alias got='git '
+alias got='git'
 
 # add
 alias ga='git add'
@@ -105,6 +111,7 @@ alias gm='git merge'
 alias gma='git merge --abort'
 alias gmc='git merge --continue'
 alias gms='git merge --squash'
+alias gmt='git mergetool'
 
 # mv
 alias gmv='git mv'

aliases/available/laravel.aliases.bash

@@ -3,7 +3,14 @@ about-alias 'laravel artisan abbreviations'
 
 # A list of useful laravel aliases
 
-alias laravel='${HOME?}/.composer/vendor/bin/laravel'
+if [[ -x "${HOME?}/.config/composer/vendor/bin/laravel" ]]; then
+	alias laravel='${HOME?}/.config/composer/vendor/bin/laravel'
+elif [[ -x "${HOME?}/.composer/vendor/bin/laravel" ]]; then
+	alias laravel='${HOME?}/.composer/vendor/bin/laravel'
+else
+	return
+fi
+
 # asset
 alias a:apub='php artisan asset:publish'
 

aliases/available/terraform.aliases.bash

@@ -1,10 +1,22 @@
 # shellcheck shell=bash
-about-alias 'Aliases for Terraform and Terragrunt'
+about-alias 'Aliases for Terraform/OpenTofu and Terragrunt'
 
-alias tf='terraform'
-alias tfi='tf init'
-alias tfv='terraform validate'
-alias tfp='terraform plan'
-alias tfa='terraform apply'
-alias tfd='terraform destroy'
-alias tfw='terraform workspace'
+if _command_exists terraform; then
+	alias tf='terraform'
+elif _command_exists tofu; then
+	alias tf='tofu'
+fi
+
+if _command_exists tf; then
+	alias tfa='tf apply'
+	alias tfp='tf plan'
+	alias tfd='tf destroy'
+	alias tfv='tf validate'
+	alias tfi='tf init'
+	alias tfo='tf output'
+	alias tfr='tf refresh'
+	alias tfw='tf workspace'
+	alias tfae='tf apply -auto-approve'
+	alias tfpa='tf plan -out=tfplan && tf apply tfplan'
+	alias tfpaf='tf plan -out=tfplan && tf apply -auto-approve tfplan'
+fi

clean_files.txt

@@ -65,15 +65,19 @@ themes/githelpers.theme.bash
 themes/gitline
 themes/inretio
 themes/lambda
+themes/liquidprompt
 themes/modern
 themes/norbu
 themes/oh-my-posh
 themes/p4helpers.theme.bash
 themes/pete
 themes/powerline
+themes/powerline-multiline
+themes/powerline-naked
 themes/pure
 themes/purity
 themes/rjorgenson
+themes/robbyrussell
 
 # vendor init files
 #

completion/available/aliases.completion.bash

@@ -9,7 +9,7 @@ about-plugin 'Automatic completion of aliases'
 
 # Automatically add completion for all aliases to commands having completion functions
 function _bash-it-component-completion-callback-on-init-aliases() {
-	local namespace="alias_completion"
+	local aliasCommandFunction namespace="alias_completion"
 	local tmp_file completion_loader alias_name line completions chars
 	local alias_arg_words new_completion compl_func compl_wrapper alias_defn
 

completion/available/terraform.completion.bash

@@ -1,10 +1,19 @@
 # shellcheck shell=bash
 
-# Make sure terraform is installed
-_command_exists terraform || return
+if _command_exists terraform; then
 
-# Don't handle completion if it's already managed
-complete -p terraform &> /dev/null && return
+	# Don't handle completion if it's already managed
+	complete -p terraform &> /dev/null && return
 
-# Terraform completes itself
-complete -C terraform terraform
+	# Terraform completes itself
+	complete -C terraform terraform
+
+elif _command_exists tofu; then
+
+	# Don't handle completion if it's already managed
+	complete -p tofu &> /dev/null && return
+
+	# OpenTofu completes itself
+	complete -C tofu tofu
+
+fi

lib/helpers.bash

@@ -22,51 +22,6 @@ else
 	BASH_IT_SED_I_PARAMETERS=('-i' '')
 fi
 
-function _command_exists() {
-	_about 'checks for existence of a command'
-	_param '1: command to check'
-	_param '2: (optional) log message to include when command not found'
-	_example '$ _command_exists ls && echo exists'
-	_group 'lib'
-	local msg="${2:-Command '$1' does not exist}"
-	if type -t "$1" > /dev/null; then
-		return 0
-	else
-		_log_debug "$msg"
-		return 1
-	fi
-}
-
-function _binary_exists() {
-	_about 'checks for existence of a binary'
-	_param '1: binary to check'
-	_param '2: (optional) log message to include when binary not found'
-	_example '$ _binary_exists ls && echo exists'
-	_group 'lib'
-	local msg="${2:-Binary '$1' does not exist}"
-	if type -P "$1" > /dev/null; then
-		return 0
-	else
-		_log_debug "$msg"
-		return 1
-	fi
-}
-
-function _completion_exists() {
-	_about 'checks for existence of a completion'
-	_param '1: command to check'
-	_param '2: (optional) log message to include when completion is found'
-	_example '$ _completion_exists gh && echo exists'
-	_group 'lib'
-	local msg="${2:-Completion for '$1' already exists}"
-	if complete -p "$1" &> /dev/null; then
-		_log_debug "$msg"
-		return 0
-	else
-		return 1
-	fi
-}
-
 function _bash_it_homebrew_check() {
 	if _binary_exists 'brew'; then
 		# Homebrew is installed
@@ -203,22 +158,6 @@ function bash-it() {
 	fi
 }
 
-function _is_function() {
-	_about 'sets $? to true if parameter is the name of a function'
-	_param '1: name of alleged function'
-	_param '2: (optional) log message to include when function not found'
-	_group 'lib'
-	_example '$ _is_function ls && echo exists'
-	_group 'lib'
-	local msg="${2:-Function '$1' does not exist}"
-	if LC_ALL=C type -t "$1" | _bash-it-fgrep -q 'function'; then
-		return 0
-	else
-		_log_debug "$msg"
-		return 1
-	fi
-}
-
 function _bash-it-aliases() {
 	_about 'summarizes available bash_it aliases'
 	_group 'lib'

lib/utilities.bash

@@ -78,6 +78,42 @@ function _bash-it-egrep() {
 	"${BASH_IT_GREP:-/usr/bin/grep}" -E "$@"
 }
 
+function _command_exists() {
+	: _about 'checks for existence of a command'
+	: _param '1: command to check'
+	: _example '$ _command_exists ls && echo exists'
+	: _group 'lib'
+
+	type -t "${1?}" > /dev/null
+}
+
+function _binary_exists() {
+	: _about 'checks for existence of a binary'
+	: _param '1: binary to check'
+	: _example '$ _binary_exists ls && echo exists'
+	: _group 'lib'
+
+	type -P "${1?}" > /dev/null
+}
+
+function _completion_exists() {
+	: _about 'checks for existence of a completion'
+	: _param '1: command to check'
+	: _example '$ _completion_exists gh && echo exists'
+	: _group 'lib'
+
+	complete -p "${1?}" &> /dev/null
+}
+
+function _is_function() {
+	: _about 'sets $? to true if parameter is the name of a function'
+	: _param '1: name of alleged function'
+	: _example '$ _is_function ls && echo exists'
+	: _group 'lib'
+
+	declare -F "${1?}" > /dev/null
+}
+
 ###########################################################################
 # Component-specific functions (component is either an alias, a plugin, or a
 # completion).
@@ -181,7 +217,7 @@ function _bash-it-component-item-is-enabled() {
 		component_type="${1}" item_name="${2?}"
 	fi
 
-	for each_file in "${BASH_IT}/enabled"/*"${BASH_IT_LOAD_PRIORITY_SEPARATOR?}${item_name}.${component_type}"*."bash" \
+	for each_file in "${BASH_IT?}/enabled"/*"${BASH_IT_LOAD_PRIORITY_SEPARATOR?}${item_name}.${component_type}"*."bash" \
 		"${BASH_IT}/${component_type}"*/"enabled/${item_name}.${component_type}"*."bash" \
 		"${BASH_IT}/${component_type}"*/"enabled"/*"${BASH_IT_LOAD_PRIORITY_SEPARATOR?}${item_name}.${component_type}"*."bash"; do
 		if [[ -f "${each_file}" ]]; then

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:"

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

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