Merge branch 'master' into add-bashcov-report

* master: (40 commits)
  Add aliases for git worktree
  Tofu completion rewrite
  have pre-commit ignore the /vendor, they should be immutable.
  Fix: __powerline_last_status_prompt to handle unset argument safely
  remove superfluous function and pick better var names for readability
  Update base.theme.bash
  Update base.theme.bash
  Update base.theme.bash
  Update base.theme.bash
  Fix for 2323 issue
  Apply fixes
  Add `.git-blame-ignore-revs`
  Clean themes A-L
  Update powerline-multiline.base.bash
  Fix a couple bugs introduced by last commit
  Fix bad merge
  Update plugins/available/extract.plugin.bash
  important syntax correction from the owenr of ble.sh
  only the correct FZF integration loads, sepending on whether the blesh plugin is enabled as well.
  readonly HIST* variables is a bit extreme and clashes with ble.sh and other tools.
  ...

Author: seefood

.git-blame-ignore-revs

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

.pre-commit-config.yaml

@@ -3,7 +3,7 @@
 ---
 # fail_fast: true
 minimum_pre_commit_version: 1.18.1
-exclude: "docs/_build/"
+exclude: "docs/_build/|vendor/"
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v2.3.0

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,16 +23,17 @@ 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/
-
-alias piano='pianobar'
+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
@@ -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.aliases.bash

@@ -212,6 +212,12 @@ alias gta='git tag -a'
 alias gtd='git tag -d'
 alias gtl='git tag -l'
 
+#worktree
+alias gw='git worktree'
+alias gwa='git worktree add'
+alias gwl='git worktree list'
+alias gwr='git worktree remove'
+
 case $OSTYPE in
 	darwin*)
 		alias gtls="git tag -l | gsort -V"

aliases/available/vim.aliases.bash

@@ -1,9 +1,11 @@
 # shellcheck shell=bash
 about-alias 'vim abbreviations'
 
-_command_exists vim || return
+alias v='${VISUAL:-vim}'
 
-alias v='vim'
+if ! _command_exists vim; then
+	_log_warning "Without 'vim', these aliases just aren't that useful..."
+fi
 # open the vim help in fullscreen incorporated from
 # https://stackoverflow.com/a/4687513
 alias vimh='vim -c ":h | only"'

clean_files.txt

@@ -41,7 +41,6 @@ themes/atomic
 themes/axin
 themes/bakke
 themes/barbuk
-themes/base.theme.bash
 themes/binaryanomaly
 themes/bira
 themes/bobby
@@ -53,19 +52,28 @@ themes/clean
 themes/codeword
 themes/cooperkid
 themes/cupcake
+themes/demula
+themes/dos
 themes/doubletime
 themes/doubletime_multiline
 themes/doubletime_multiline_pyonly
 themes/dulcie
 themes/duru
 themes/easy
 themes/elixr
+themes/emperor
+themes/envy
 themes/essential
-themes/githelpers.theme.bash
+themes/font
+themes/gallifrey
 themes/gitline
+themes/hawaii50
 themes/inretio
+themes/iterate
+themes/kitsune
 themes/lambda
 themes/liquidprompt
+themes/luan
 themes/modern
 themes/norbu
 themes/oh-my-posh

completion/available/apm.completion.bash

@@ -1,4 +1,4 @@
 # shellcheck shell=bash
 about-completion "apm completion"
-# shellcheck disable=SC1090
-source "${BASH_IT}"/vendor/github.com/vigo/apm-bash-completion/apm
+# shellcheck source-path=SCRIPTDIR/../../vendor/github.com/vigo/apm-bash-completion
+source "${BASH_IT?}/vendor/github.com/vigo/apm-bash-completion/apm"

completion/available/awless.completion.bash

@@ -1,5 +1,10 @@
 # shellcheck shell=bash
-if _command_exists awless; then
-	# shellcheck disable=SC1090
-	source <(awless completion bash)
-fi
+
+# Make sure awless is installed
+_bash-it-completion-helper-necessary awless || return
+
+# Don't handle completion if it's already managed
+_bash-it-completion-helper-sufficient awless || return
+
+# shellcheck disable=SC1090
+source <(awless completion bash)