prompt now display contextual infos

2026-05-20 14:14:06 +02:00
parent 28e4c112af
commit d22b24e54c
14 changed files with 159 additions and 6 deletions
--- a/profile.d/prompt.sh
+++ b/profile.d/prompt.sh
@@ -78,6 +78,7 @@ load_theme()
        [PROMPT_COLOR_ERR_BG]=1    [PROMPT_COLOR_ERR_FG]=1    [PROMPT_COLOR_ERR_MARK]=1
        [PROMPT_COLOR_ROOT_FG]=1   [PROMPT_COLOR_USER_FG]=1
        [PROMPT_COLOR_DIR_FG]=1
+        [PROMPT_COLOR_CTX_FG]=1
    )

    # ---- Colour variable names exported by disp.sh --------------------------
@@ -285,6 +286,68 @@ function timer_stop
 # command, the elapsed time of the last command, and the current user and host.
 set_prompt()
 {
+    _prompt_git_segment()
+    {
+        # Fast path: skip git lookup when feature is disabled.
+        [[ "${PROMPT_SHOW_GIT:-1}" == "0" ]] && return 0
+
+        local branch
+        branch=$(git symbolic-ref --quiet --short HEAD 2>/dev/null) || \
+            branch=$(git rev-parse --short HEAD 2>/dev/null) || return 0
+
+        local dirty="" sync=""
+        if [[ "${PROMPT_SHOW_GIT_STATUS:-1}" != "0" ]]; then
+            if ! git diff --no-ext-diff --quiet --ignore-submodules -- 2>/dev/null || \
+               ! git diff --cached --no-ext-diff --quiet --ignore-submodules -- 2>/dev/null; then
+                dirty="*"
+            fi
+
+            local counts ahead behind
+            counts=$(git rev-list --left-right --count @{upstream}...HEAD 2>/dev/null) || counts=""
+            if [[ "$counts" =~ ^([0-9]+)[[:space:]]+([0-9]+)$ ]]; then
+                behind="${BASH_REMATCH[1]}"
+                ahead="${BASH_REMATCH[2]}"
+                if [[ "$ahead" -gt 0 || "$behind" -gt 0 ]]; then
+                    sync=" +${ahead}/-${behind}"
+                fi
+            fi
+        fi
+
+        printf "%s" "git:${branch}${dirty}${sync}"
+    }
+
+    _prompt_conda_env()
+    {
+        [[ "${PROMPT_SHOW_CONDA:-1}" == "0" ]] && return 0
+        [[ -z "${CONDA_DEFAULT_ENV:-}" ]] && return 0
+        printf "%s" "conda:${CONDA_DEFAULT_ENV}"
+    }
+
+    _prompt_venv_env()
+    {
+        [[ "${PROMPT_SHOW_VENV:-1}" == "0" ]] && return 0
+        [[ -n "${CONDA_DEFAULT_ENV:-}" ]] && return 0
+        [[ -z "${VIRTUAL_ENV:-}" ]] && return 0
+        printf "%s" "venv:${VIRTUAL_ENV##*/}"
+    }
+
+    _prompt_session_markers()
+    {
+        [[ "${PROMPT_SHOW_SESSION:-1}" == "0" ]] && return 0
+
+        local -a tags=()
+        [[ -n "${SSH_CONNECTION:-}" ]] && tags+=("ssh")
+        [[ -n "${TMUX:-}" ]] && tags+=("tmux")
+        [[ -n "${STY:-}" ]] && tags+=("screen")
+        [[ ${#tags[@]} -eq 0 ]] && return 0
+
+        local out="${tags[0]}" i
+        for ((i=1; i<${#tags[@]}; ++i)); do
+            out+="+${tags[i]}"
+        done
+        printf "%s" "$out"
+    }
+
    local Last_Command=$? # Must come first!
    local FancyX='\342\234\227'
    local Checkmark='\342\234\223'
@@ -301,6 +364,7 @@ set_prompt()
    local _root_fg="${PROMPT_COLOR_ROOT_FG:-$Red}"
    local _user_fg="${PROMPT_COLOR_USER_FG:-$BGreen}"
    local _dir_fg="${PROMPT_COLOR_DIR_FG:-$ICyan}"
+    local _ctx_fg="${PROMPT_COLOR_CTX_FG:-$BIYellow}"

    # Begin with time (cursor-save is non-printing; all ANSI sequences wrapped
    # in \[...\] so bash does not count them toward the visible line width).
@@ -330,6 +394,42 @@ set_prompt()
    else
        PS1+="\[${_user_fg}${_bar_bg}\] \\u@\\h"
    fi
+
+    # Optional context segment appended at the end of the top bar.
+    local _git_seg _conda_env _venv_env _session_tags _ctx=""
+    _git_seg="$(_prompt_git_segment)"
+    _conda_env="$(_prompt_conda_env)"
+    _venv_env="$(_prompt_venv_env)"
+    _session_tags="$(_prompt_session_markers)"
+
+    if [[ -n "$_git_seg" ]]; then
+        _ctx="$_git_seg"
+    fi
+    if [[ -n "$_conda_env" ]]; then
+        if [[ -n "$_ctx" ]]; then
+            _ctx+=" | ${_conda_env}"
+        else
+            _ctx="${_conda_env}"
+        fi
+    fi
+    if [[ -n "$_venv_env" ]]; then
+        if [[ -n "$_ctx" ]]; then
+            _ctx+=" | ${_venv_env}"
+        else
+            _ctx="${_venv_env}"
+        fi
+    fi
+    if [[ -n "$_session_tags" ]]; then
+        if [[ -n "$_ctx" ]]; then
+            _ctx+=" | ${_session_tags}"
+        else
+            _ctx="${_session_tags}"
+        fi
+    fi
+    if [[ -n "$_ctx" ]]; then
+        PS1+="\[${_ctx_fg}${_bar_bg}\] [ ${_ctx} ]"
+    fi
+
    PS1+="\[\e[K\e[u\]\[$RESETCOL\]\n"
    # Print the working directory and prompt marker, then reset colour.
    PS1+="\[${_dir_fg}\]\\w \\\$\[$RESETCOL\] "
--- a/profile.d/themes/abyss.theme
+++ b/profile.d/themes/abyss.theme
@@ -40,3 +40,4 @@ PROMPT_COLOR_ERR_MARK="$IYellow"          # golden X
 PROMPT_COLOR_ROOT_FG="$IRed"         # red for root
 PROMPT_COLOR_USER_FG="$IBlue"        # electric blue for user
 PROMPT_COLOR_DIR_FG="$ICyan"         # teal path
+PROMPT_COLOR_CTX_FG="$IYellow"       # context segment (git/conda)
--- a/profile.d/themes/adwaita.theme
+++ b/profile.d/themes/adwaita.theme
@@ -40,3 +40,4 @@ PROMPT_COLOR_ERR_MARK="$Yellow"      # yellow X (warning intent)
 PROMPT_COLOR_ROOT_FG="$Red"          # Adwaita red for root
 PROMPT_COLOR_USER_FG="$BBlue"        # darker bold blue — readable on blue bar
 PROMPT_COLOR_DIR_FG="$IGreen"        # Adwaita green for path
+PROMPT_COLOR_CTX_FG="$BIWhite"       # context segment (git/conda)
--- a/profile.d/themes/dark.theme
+++ b/profile.d/themes/dark.theme
@@ -30,3 +30,4 @@ PROMPT_COLOR_ERR_MARK="$BIYellow"   # X mark colour on failure
 PROMPT_COLOR_ROOT_FG="$BIRed"       # Username colour when root
 PROMPT_COLOR_USER_FG="$ICyan"       # Username@host colour for normal users
 PROMPT_COLOR_DIR_FG="$IPurple"      # Working directory colour
+PROMPT_COLOR_CTX_FG="$BIYellow"     # Context segment (git/conda)
--- a/profile.d/themes/default.theme
+++ b/profile.d/themes/default.theme
@@ -30,3 +30,4 @@ PROMPT_COLOR_ERR_MARK="$BYellow"    # X mark colour on failure
 PROMPT_COLOR_ROOT_FG="$Red"         # Username colour when root
 PROMPT_COLOR_USER_FG="$Green"       # Username@host colour for normal users
 PROMPT_COLOR_DIR_FG="$ICyan"        # Working directory colour
+PROMPT_COLOR_CTX_FG="$BIYellow"     # Context segment (git/conda)
--- a/profile.d/themes/light.theme
+++ b/profile.d/themes/light.theme
@@ -33,3 +33,4 @@ PROMPT_COLOR_ERR_MARK="$BYellow"    # X mark on failure (BIYellow → BYellow, l
 PROMPT_COLOR_ROOT_FG="$Red"         # Username when root         (BIRed → Red)
 PROMPT_COLOR_USER_FG="$Blue"        # Username@host normal user  (ICyan → Blue)
 PROMPT_COLOR_DIR_FG="$Purple"       # Working directory          (IPurple → Purple)
+PROMPT_COLOR_CTX_FG="$BBlack"       # Context segment (git/conda)
--- a/profile.d/themes/monochrome.theme
+++ b/profile.d/themes/monochrome.theme
@@ -62,3 +62,4 @@ PROMPT_COLOR_ERR_MARK="$BBlack"      # bold black X
 PROMPT_COLOR_ROOT_FG="$BIWhite"      # bold bright white for root warning
 PROMPT_COLOR_USER_FG="$IWhite"       # bright white for normal user
 PROMPT_COLOR_DIR_FG="$White"         # standard white for path
+PROMPT_COLOR_CTX_FG="$BIWhite"       # context segment (git/conda)
--- a/profile.d/themes/monokai.theme
+++ b/profile.d/themes/monokai.theme
@@ -43,3 +43,4 @@ PROMPT_COLOR_ERR_MARK="$IRed"        # hot pink X
 PROMPT_COLOR_ROOT_FG="$IRed"         # hot pink for root
 PROMPT_COLOR_USER_FG="$IYellow"      # orange-yellow for user
 PROMPT_COLOR_DIR_FG="$ICyan"         # electric cyan for path
+PROMPT_COLOR_CTX_FG="$IYellow"       # context segment (git/conda)
--- a/profile.d/themes/plasma.theme
+++ b/profile.d/themes/plasma.theme
@@ -40,3 +40,4 @@ PROMPT_COLOR_ERR_MARK="$IYellow"     # yellow X
 PROMPT_COLOR_ROOT_FG="$IRed"         # red for root
 PROMPT_COLOR_USER_FG="$BIPurple"     # bold vivid purple for user
 PROMPT_COLOR_DIR_FG="$ICyan"         # electric cyan path
+PROMPT_COLOR_CTX_FG="$IYellow"       # context segment (git/conda)
--- a/profile.d/themes/solarized-light.theme
+++ b/profile.d/themes/solarized-light.theme
@@ -125,3 +125,4 @@ PROMPT_COLOR_ERR_MARK="\e[38;2;253;246;227m" # Base3   — X mark (bright on red
 PROMPT_COLOR_ROOT_FG="\e[38;2;220;50;47m"    # Red     — root warning
 PROMPT_COLOR_USER_FG="\e[38;2;42;161;152m"   # Cyan    — normal user
 PROMPT_COLOR_DIR_FG="\e[38;2;38;139;210m"    # Blue    — working directory
+PROMPT_COLOR_CTX_FG="\e[38;2;181;137;0m"     # Yellow  — context segment (git/conda)
--- a/profile.d/themes/solarized.theme
+++ b/profile.d/themes/solarized.theme
@@ -120,3 +120,4 @@ PROMPT_COLOR_ERR_MARK="\e[1;38;2;253;246;227m" # Base3 bold — bright warm mark
 PROMPT_COLOR_ROOT_FG="\e[38;2;220;50;47m"    # Red     — root warning
 PROMPT_COLOR_USER_FG="\e[38;2;42;161;152m"   # Cyan    — normal user
 PROMPT_COLOR_DIR_FG="\e[38;2;38;139;210m"    # Blue    — working directory
+PROMPT_COLOR_CTX_FG="\e[38;2;181;137;0m"     # Yellow  — context segment (git/conda)