diff --git a/dot_bashrc b/dot_bashrc index 3289ac7..2b1b7c3 100644 --- a/dot_bashrc +++ b/dot_bashrc @@ -29,6 +29,11 @@ HISTFILESIZE=2000 # update the values of LINES and COLUMNS. shopt -s checkwinsize +# add home bin +if [ -d "$HOME/.local/bin" ]; then + export PATH="$HOME/.local/bin:$PATH" +fi + # --------------------------------------------------------------------------- # EDITOR # --------------------------------------------------------------------------- @@ -52,36 +57,40 @@ alias vi=$EDITOR # PROMPT # --------------------------------------------------------------------------- -# set a minimalist prompt -red='\[\e[0;31m\]' # Red -green='\[\e[0;32m\]' # Green -blue='\[\e[0;34m\]' # Bold Blue -boldred='\[\e[1;31m\]' # Bold Red -reset='\[\e[0m\]' # Text Reset - -if [ "$USER" = "root" ] ; then - # $bold$red - PROMPT_USER_COLOR=$boldred - PROMPT_SYMBOL="#" -else - PROMPT_USER_COLOR=$green - PROMPT_SYMBOL="$" -fi - -if [[ -n "$SSH_CLIENT$SSH2_CLIENT$SSH_TTY" ]] ; then - PROMPT_SSH="@\h" +if [ -f "$HOME/.local/bin/starship" ]; then + eval "$(starship init bash)" else - PROMPT_SSH="" -fi - -PS1="$PROMPT_USER_COLOR\u$PROMPT_SSH $blue\w$reset $PROMPT_SYMBOL " - -if [ -f "$HOME/.bash-git-prompt/gitprompt.sh" ]; then - GIT_PROMPT_ONLY_IN_REPO=1 - GIT_PROMPT_IGNORE_SUBMODULES=1 - GIT_PROMPT_WITH_VIRTUAL_ENV=0 - GIT_PROMPT_THEME=Solarized_Yax - source $HOME/.bash-git-prompt/gitprompt.sh + # set a minimalist prompt + red='\[\e[0;31m\]' # Red + green='\[\e[0;32m\]' # Green + blue='\[\e[0;34m\]' # Bold Blue + boldred='\[\e[1;31m\]' # Bold Red + reset='\[\e[0m\]' # Text Reset + + if [ "$USER" = "root" ] ; then + # $bold$red + PROMPT_USER_COLOR=$boldred + PROMPT_SYMBOL="#" + else + PROMPT_USER_COLOR=$green + PROMPT_SYMBOL="$" + fi + + if [[ -n "$SSH_CLIENT$SSH2_CLIENT$SSH_TTY" ]] ; then + PROMPT_SSH="@\h" + else + PROMPT_SSH="" + fi + + PS1="$PROMPT_USER_COLOR\u$PROMPT_SSH $blue\w$reset $PROMPT_SYMBOL " + + if [ -f "$HOME/.bash-git-prompt/gitprompt.sh" ]; then + GIT_PROMPT_ONLY_IN_REPO=1 + GIT_PROMPT_IGNORE_SUBMODULES=1 + GIT_PROMPT_WITH_VIRTUAL_ENV=0 + GIT_PROMPT_THEME=Solarized_Yax + source $HOME/.bash-git-prompt/gitprompt.sh + fi fi # --------------------------------------------------------------------------- @@ -129,6 +138,3 @@ if [ -d "$HOME/.bashrc.d/" ]; then done fi -if [ -d "$HOME/.local/bin" ]; then - export PATH="$HOME/.local/bin:$PATH" -fi diff --git a/private_dot_config/starship.toml b/private_dot_config/starship.toml index 69fa7d1..a3a17ab 100644 --- a/private_dot_config/starship.toml +++ b/private_dot_config/starship.toml @@ -1,21 +1,10 @@ # Inserts a blank line between shell prompts -add_newline = false - -[git_status] -conflicted = "⚔️ " -ahead = "🏎️ 💨 ×${count}" -behind = "🐢 ×${count}" -diverged = "🔱 🏎️ 💨 ×${ahead_count} 🐢 ×${behind_count}" -untracked = "🛤️ ×${count}" -stashed = "📦 " -modified = "📝 ×${count}" -staged = "🗃️ ×${count}" -renamed = "📛 ×${count}" -deleted = "🗑️ ×${count}" -style = "bright-white" -format = "$all_status$ahead_behind" +add_newline = true [directory] truncation_length = 5 truncation_symbol = "…/" truncate_to_repo = false + +[package] +disabled = true