Merge branch 'master' into lib/completion/components

Author: seefood

.git-blame-ignore-revs

@@ -0,0 +1,5 @@
+# Ignore shfmt related commits
+003b0ce802c10ab6e161d7ba5a7d9b6722312cc5
+7c2c2a5525557cbfee98e73de921fd7f7e6811a1
+d37505b636ca7bc95301d8daaf9c58a3186ce57a
+d7695d5456b980190b6d1c4a4715b13d1b63c332

.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/directory.aliases.bash

@@ -0,0 +1,26 @@
+# shellcheck shell=bash
+about-alias 'Shortcuts for directory commands: ls, cd, &c.'
+
+if command ls --color -d . &> /dev/null; then
+	alias ls='ls --color=auto'
+	# BSD `ls` doesn't need an argument (`-G`) when `$CLICOLOR` is set.
+fi
+
+# List directory contents
+alias sl=ls
+alias la='ls -AF' # Compact view, show hidden
+alias ll='ls -Al'
+alias l='ls -A'
+alias l1='ls -1'
+alias lf='ls -F'
+
+# Change 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
+
+# Create or remove directory
+alias md='mkdir -p'
+alias rd='rmdir'

aliases/available/editor.aliases.bash

@@ -0,0 +1,14 @@
+# shellcheck shell=bash
+about-alias 'shortcuts for editing'
+
+alias edit='${EDITOR:-${ALTERNATE_EDITOR:-nano}}'
+alias e='edit'
+
+# sudo editors
+alias svim='sudo ${VISUAL:-vim}'
+alias snano='sudo ${ALTERNATE_EDITOR:-nano}'
+alias sedit='sudo ${EDITOR:-${ALTERNATE_EDITOR:-nano}}'
+
+# Shortcuts to edit startup files
+alias vbrc='${VISUAL:-vim} ~/.bashrc'
+alias vbpf='${VISUAL:-vim} ~/.bash_profile'

aliases/available/general.aliases.bash

@@ -1,25 +1,9 @@
 # shellcheck shell=bash
+# shellcheck source-path=SCRIPTDIR
 about-alias 'general aliases'
 
-if command ls --color -d . &> /dev/null; then
-	alias ls='ls --color=auto'
-	# BSD `ls` doesn't need an argument (`-G`) when `$CLICOLOR` is set.
-fi
-
-# List directory contents
-alias sl=ls
-alias la='ls -AF' # Compact view, show hidden
-alias ll='ls -al'
-alias l='ls -a'
-alias l1='ls -1'
-alias lf='ls -F'
-
 alias _='sudo'
 
-# Shortcuts to edit startup files
-alias vbrc='${VISUAL:-vim} ~/.bashrc'
-alias vbpf='${VISUAL:-vim} ~/.bash_profile'
-
 # colored grep
 # Need to check an existing file for a pattern that will be found to ensure
 # that the check works when on an OS that supports the color option
@@ -39,23 +23,24 @@ alias pager='${PAGER:=less}'
 
 alias q='exit'
 
-alias irc='${IRC_CLIENT:=irc}'
+alias irc='${IRC_CLIENT:-irc}'
 
 # Language aliases
 alias rb='ruby'
 alias py='python'
 alias ipy='ipython'
 
 # Pianobar can be found here: http://github.com/PromyLOPh/pianobar/
+if _command_exists pianobar; then
+	alias piano='pianobar'
+fi
 
-alias piano='pianobar'
-
-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'
@@ -92,5 +77,6 @@ function catt() {
 # aliases and enable just the ones for Bash-it explicitly:
 # bash-it disable alias general
 # bash-it enable alias bash-it
-# shellcheck source-path=SCRIPTDIR
 source "$BASH_IT/aliases/available/bash-it.aliases.bash"
+source "$BASH_IT/aliases/available/directory.aliases.bash"
+source "$BASH_IT/aliases/available/editor.aliases.bash"

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