Update 3 files
- /home/.chezmoiscripts/universal/run_onchange_after_94-bash-it.tmpl - /home/dot_bashrc - /software.yml
This commit is contained in:
parent
0be66701aa
commit
354a411ded
3 changed files with 44 additions and 31 deletions
|
@ -4,12 +4,28 @@
|
||||||
{{ includeTemplate "universal/profile" }}
|
{{ includeTemplate "universal/profile" }}
|
||||||
{{ includeTemplate "universal/logg" }}
|
{{ includeTemplate "universal/logg" }}
|
||||||
|
|
||||||
|
### Ensure Powerline is installed
|
||||||
|
if ! command -v powerline > /dev/null; then
|
||||||
|
install-software powerline
|
||||||
|
fi
|
||||||
|
|
||||||
### Bash-it completions / plugins
|
### Bash-it completions / plugins
|
||||||
if command -v bash-it; then
|
if command -v powerline > /dev/null; then
|
||||||
logg info 'Enabling bash-it completions'
|
if command -v bash-it > /dev/null; then
|
||||||
bash-it enable completion defaults dirs docker docker-compose export git makefile ng npm ssh system vagrant
|
if [ -n "$BASH_IT" ]; then
|
||||||
logg info 'Enabling bash-it plugins'
|
cd "$BASH_IT" || logg warn "The $BASH_IT directory does not exist"
|
||||||
bash-it enable plugin base blesh browser cht-sh dirs gitstatus powerline sudo xterm
|
logg info 'Enabling bash-it completions'
|
||||||
|
yes | bash-it enable completion defaults dirs docker docker-compose export git makefile ng npm ssh system vagrant
|
||||||
|
logg info 'Enabling bash-it plugins'
|
||||||
|
yes | bash-it enable plugin base blesh browser cht-sh dirs gitstatus powerline sudo xterm
|
||||||
|
else
|
||||||
|
logg warn 'The BASH_IT variable needs to be defined'
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
logg warn '`bash-it` is not available'
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
logg warn '`powerline` is not available'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
{{ end -}}
|
{{ end -}}
|
||||||
|
|
|
@ -23,8 +23,24 @@ if [ -f "$HOME/.config/shell/profile.sh" ]; then
|
||||||
. "$HOME/.config/shell/profile.sh"
|
. "$HOME/.config/shell/profile.sh"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Prompt (on bash only)
|
### Fig / LC_ALL
|
||||||
if [ "$BASH_SUPPORT" = 'true' ]; then
|
if [ "$BASH_SUPPORT" = 'true' ]; then
|
||||||
|
if [ -f "$HOME/.fig/shell/bashrc.pre.bash" ]; then
|
||||||
|
. "$HOME/.fig/shell/bashrc.pre.bash"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
### History
|
||||||
|
export HISTFILE="$XDG_STATE_HOME/bash/history"
|
||||||
|
|
||||||
|
### /etc/bashrc
|
||||||
|
if [ -f /etc/bashrc ]; then
|
||||||
|
. /etc/bashrc
|
||||||
|
fi
|
||||||
|
|
||||||
|
### Bash Initialization Hooks
|
||||||
|
if [ "$BASH_SUPPORT" = 'true' ]; then
|
||||||
|
# Prompt (on bash only)
|
||||||
if [[ "$(hostname)" != *'-minimal' ]]; then
|
if [[ "$(hostname)" != *'-minimal' ]]; then
|
||||||
### Styled Terminal
|
### Styled Terminal
|
||||||
export BASH_IT="$HOME/.local/bash_it"
|
export BASH_IT="$HOME/.local/bash_it"
|
||||||
|
@ -48,32 +64,7 @@ if [ "$BASH_SUPPORT" = 'true' ]; then
|
||||||
eval "$(oh-my-posh init bash --config "$XDG_CONFIG_HOME/oh-my-posh/Betelgeuse-minimal.omp.json")"
|
eval "$(oh-my-posh init bash --config "$XDG_CONFIG_HOME/oh-my-posh/Betelgeuse-minimal.omp.json")"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
|
||||||
|
|
||||||
### Fig / LC_ALL
|
|
||||||
if [ "$BASH_SUPPORT" = 'true' ]; then
|
|
||||||
if [ -f "$HOME/.fig/shell/bashrc.pre.bash" ]; then
|
|
||||||
. "$HOME/.fig/shell/bashrc.pre.bash"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
### Settings
|
|
||||||
if command -v shopt > /dev/null; then
|
|
||||||
shopt -s globstar
|
|
||||||
shopt -s histappend
|
|
||||||
shopt -s checkwinsize
|
|
||||||
fi
|
|
||||||
|
|
||||||
### History
|
|
||||||
export HISTFILE="$XDG_STATE_HOME/bash/history"
|
|
||||||
|
|
||||||
### /etc/bashrc
|
|
||||||
if [ -f /etc/bashrc ]; then
|
|
||||||
. /etc/bashrc
|
|
||||||
fi
|
|
||||||
|
|
||||||
### Bash Initialization Hooks
|
|
||||||
if [ "$BASH_SUPPORT" = 'true' ]; then
|
|
||||||
### Bash Completion
|
### Bash Completion
|
||||||
if [ -f "/usr/local/etc/profile.d/bash_completion.sh" ]; then
|
if [ -f "/usr/local/etc/profile.d/bash_completion.sh" ]; then
|
||||||
. "/usr/local/etc/profile.d/bash_completion.sh"
|
. "/usr/local/etc/profile.d/bash_completion.sh"
|
||||||
|
|
|
@ -3702,6 +3702,12 @@ softwarePackages:
|
||||||
edex-ui:
|
edex-ui:
|
||||||
_desc: null
|
_desc: null
|
||||||
appimage: edex-ui
|
appimage: edex-ui
|
||||||
|
powerline:
|
||||||
|
_bin: powerline
|
||||||
|
apt: powerline
|
||||||
|
dnf: powerline
|
||||||
|
pacman: powerline
|
||||||
|
pipx: powerline-status
|
||||||
handlr:
|
handlr:
|
||||||
_bin: handlr
|
_bin: handlr
|
||||||
_desc: A better xdg-utils
|
_desc: A better xdg-utils
|
||||||
|
|
Loading…
Reference in a new issue