Update with changes in 2026.

This commit is contained in:
2026-06-19 15:58:41 -05:00
parent 70a803d6c7
commit abd53d2cc5
6 changed files with 233 additions and 79 deletions
+182 -53
View File
@@ -1,73 +1,202 @@
# ~/.bashrc: executed by bash(1) for non-login shells.
# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
# for examples
# If not running interactively, don't do anything
case $- in
*i*) ;;
*) return;;
esac
# don't put duplicate lines or lines starting with space in the history.
# See bash(1) for more options
HISTCONTROL=ignoreboth
# append to the history file, don't overwrite it
shopt -s histappend
# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
HISTSIZE=1000
HISTFILESIZE=2000
# check the window size after each command and, if necessary,
# update the values of LINES and COLUMNS.
shopt -s checkwinsize
# If set, the pattern "**" used in a pathname expansion context will
# match all files and zero or more directories and subdirectories.
#shopt -s globstar
# make less more friendly for non-text input files, see lesspipe(1)
[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
# set variable identifying the chroot you work in (used in the prompt below)
if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
debian_chroot=$(cat /etc/debian_chroot)
fi
# set a fancy prompt (non-color, unless we know we "want" color)
case "$TERM" in
xterm-color|*-256color) color_prompt=yes;;
esac
# uncomment for a colored prompt, if the terminal has the capability; turned
# off by default to not distract the user: the focus in a terminal window
# should be on the output of commands, not on the prompt
#force_color_prompt=yes
if [ -n "$force_color_prompt" ]; then
if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
# We have color support; assume it's compliant with Ecma-48
# (ISO/IEC-6429). (Lack of such support is extremely rare, and such
# a case would tend to support setf rather than setaf.)
color_prompt=yes
else
color_prompt=
fi
fi
if [ "$color_prompt" = yes ]; then
PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
else
PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
fi
unset color_prompt force_color_prompt
# Alias definitions.
# You may want to put all your additions into a separate file like
# ~/.bash_aliases, instead of adding them here directly.
# See /usr/share/doc/bash-doc/examples in the bash-doc package.
if [ -f ~/.bash_aliases ]; then
. ~/.bash_aliases
fi
# enable programmable completion features (you don't need to enable
# this, if it's already enabled in /etc/bash.bashrc and /etc/profile
# sources /etc/bash.bashrc).
if ! shopt -oq posix; then
if [ -f /usr/share/bash-completion/bash_completion ]; then
. /usr/share/bash-completion/bash_completion
elif [ -f /etc/bash_completion ]; then
. /etc/bash_completion
fi
fi
# set PATH so it includes user's private bin if it exists
if [ -d "$HOME/bin" ] ; then
PATH="$HOME/bin:$PATH"
fi
# set PATH so it includes user's private bin if it exists
if [ -d "$HOME/.local/bin" ] ; then
PATH="$HOME/.local/bin:$PATH"
fi
export EDITOR=vim
sshAgentPid=`pgrep ssh-agent`
if [[ $sshAgentPid == "" ]]; then
ssh-agent > ~/.ssh/agent-env.sh
fi
source ~/.ssh/agent-env.sh
# requires the following utilities:
# git
# GNU coreutils (for realpath)
# BSD basename
prompt_command() {
local retval=$?
local branch="";
local clean="";
local cols=$COLUMNS
local retval=$?
local branch=""
local branchLength=0
local clean=""
local workingDir=""
local numcolor="\[\e[0;33m\]"
local red="\[\e[0;31m\]"
local sepcolor="\[\e[1;30m\]"
local yellow="\[\e[0;33m\]"
local brightyellow="\[\e[1;33m\]"
local brightblue="\[\e[1;34m\]"
local default="\[\e[0m\]"
local green="\[\e[0;32m\]"
local numcolor="\[\e[0;33m\]"
local red="\[\e[0;31m\]"
local sepcolor="\[\e[1;30m\]"
local default="\[\e[0m\]"
local green="\[\e[0;32m\]"
local cyan="\[\e[0;94m\]"
local columns="${COLUMNS:-80}"
if [[ $retval != 0 ]]; then
numcolor="\[\e[1;41;33m\]"
fi
if [[ ! $columns =~ ^[0-9]+$ ]] || (( columns <= 0 )); then
columns=80
fi
local longPromptThreshold=$(( columns / 3 ))
if git branch &>/dev/null; then
branch="$green$(git branch 2>/dev/null | grep \* | cut -d ' ' -f 2-)"
clean=$(git status | grep clean)
if [ -z "$clean" ]; then clean="${red}"; else clean=""; fi
fi
if [[ $retval -ne 0 ]]; then
numcolor="\[\e[1;41;33m\]"
fi
userHost="${debian_chroot:+($debian_chroot)}$numcolor\!$red \u$sepcolor@${brightblue}\h${default}:${branch}${clean}"
userHostExp="${debian_chroot:+($debian_chroot)}\! \u@\h:${branch}${clean}"
userHostExp=${userHostExp@P}
# If we're in a git repo
local repoDir
if repoDir=$(git rev-parse --show-toplevel 2>/dev/null); then
local branchName
local branchPrompt
local relDir
wrkDir="$default\w$green"
wrkDirExp="\w"
wrkDirExp=${wrkDirExp@P}
userPrompt="\$${default}"
if (( ${#userHostExp} + ${#wrkDirExp} < $cols - 20 )); then
# We can fit everything on one line
# echo "Oneline: $((${#userHostExp} + ${#wrkDirExp})) < $(($cols - 20))"
PS1="${userHost} ${wrkDir}${userPrompt} "
elif (( ${#userHostExp} + ${#wrkDirExp} < $cols + 6 )); then
# We just need to put the prompt on it's own line
# echo "Twoline: $((${#userHostExp} + ${#wrkDirExp})) < $(($cols + 6))"
PS1="\n${userHost} ${wrkDir}\n${userPrompt} "
if branchName=$(git symbolic-ref --quiet --short HEAD 2>/dev/null); then
:
elif branchName=$(git describe --tags --exact-match 2>/dev/null); then
branchName="tag:${branchName}"
elif branchName=$(git rev-parse --short HEAD 2>/dev/null); then
branchName="detached:${branchName}"
else
# We need to put the userHost on it's own line
PS1="\n${userHost}\n"
if (( ${#wrkDirExp} < $cols - 20 )); then
# We can fit the prompt and working dir on one line
# echo "Twoline2: $(( ${#wrkDirExp} )) < $(($cols - 20 ))"
PS1+="${wrkDir}${userPrompt} "
else
# We have to put the prompt on it's own line
# echo "Threeline"
PS1+="${wrkDir}\n${userPrompt} "
fi
branchName=""
fi
unset clean numcolor branch retval cols
unset userHost userHostExp wrkDir wrkDirExp userPrompt userPromptExp
if [[ -n $branchName ]]; then
branchLength=${#branchName}
branchPrompt=$branchName
branchPrompt=${branchPrompt//\\/\\\\}
branchPrompt=${branchPrompt//$/\\\$}
branchPrompt=${branchPrompt//\`/\\\`}
branch="$cyan${branchPrompt}"
fi
if [[ -n $(git status --porcelain 2>/dev/null) ]]; then
clean="${red}++"
fi
relDir=$(realpath "--relative-to=${repoDir}" "${PWD}")
workingDir=$(basename "${repoDir}")
if [[ $relDir != "." ]]; then
workingDir+="/${relDir}"
fi
else
workingDir=$PWD
fi
local workingDirPrompt=$workingDir
workingDirPrompt=${workingDirPrompt//\\/\\\\}
workingDirPrompt=${workingDirPrompt//$/\\\$}
workingDirPrompt=${workingDirPrompt//\`/\\\`}
PS1="$numcolor\!$red \u$sepcolor@${green}\h${default}:${branch}${clean} "
# Add a linebreak if the branch name + working dir will make the line
# overly long.
if (( branchLength + ${#workingDir} > longPromptThreshold )); then
PS1="\r\n${PS1}\r\n"
fi
PS1+="$default$workingDirPrompt"
# If the working dir is itself too long, put it on its own line and put
# the prompt below it.
if (( ${#workingDir} > longPromptThreshold )); then
PS1+="\r\n"
fi
PS1+="${green}\\\$${default} "
}
PROMPT_COMMAND=prompt_command
eval "$(thefuck --alias fixit)"
set -o vi
source ~/.bash_aliases
eval "$(mise activate bash)"