fix issues related to the prompt

This commit is contained in:
frosty 2024-05-29 06:31:20 -04:00
parent ed19c1a086
commit 68bb4189bd

View file

@ -10,21 +10,23 @@ HISTFILESIZE=100000
export HISTCONTROL="ignoredups" export HISTCONTROL="ignoredups"
git_branch() { git_branch() {
branch=$(git branch 2>/dev/null | grep '^*' | colrm 1 2) # shellcheck disable=SC2063
if [ ! -z "$branch" ]; then branch=$(git branch 2>/dev/null | grep '^*' | colrm 1 2)
if [ -n "$(git status --porcelain)" ]; then if [ -n "$branch" ]; then
color="31" # Red for changes if [ -n "$(git status --porcelain)" ]; then
elif [ "$(git stash list)" ]; then color="31" # Red for changes
color="33" # Yellow for stashed changes elif [ "$(git stash list)" ]; then
else color="33" # Yellow for stashed changes
color="32" # Green for a clean state else
color="32" # Green for a clean state
fi
echo -e "\\e[0;${color}m${branch}\\e[0m"
fi fi
echo -e "\\e[0;${color}m${branch}\\e[0m"
fi
} }
PS1='\[\e[1;32m\]\u@\h \[\e[1;34m\]\w \[\e[1;33m\]\$(git_branch) \[\e[0m\]\$ ' PS1="\[\e[1;32m\]\u@\h \[\e[1;34m\]\w \$(git_branch) \[\e[0m\]\$ "
# shellcheck disable=SC1091
[ -f "$XDG_CONFIG_HOME/shell/shortcuts" ] && . "$XDG_CONFIG_HOME/shell/shortcuts" [ -f "$XDG_CONFIG_HOME/shell/shortcuts" ] && . "$XDG_CONFIG_HOME/shell/shortcuts"
alias ls='ls --color=auto' alias ls='ls --color=auto'
@ -49,7 +51,7 @@ alias ll='ls -alF'
alias la='ls -A' alias la='ls -A'
alias l='ls -CF' alias l='ls -CF'
skinstall() { skli() {
rm config.h rm config.h
make || return make || return
doas make install doas make install