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