Commit 57d2ef5087ad

@@ -1,84 +1,53 @@
 # shellcheck shell=bash disable=SC2296,SC2076,SC2154,SC2004,SC2016,SC2155
 # Simple, fast zsh prompt configuration (zsh-only, not bash-compatible)
-# Smart path shortening for long directories
+# Smart path shortening for prompt
 
-# Shorten path by abbreviating middle segments to first letter
-# $1: path string, $2: max length, $3: number of leading segments to keep (default 1)
+# Shorten a path by abbreviating all segments except the last to first letter
+# $1: path string, $2: max length (default 50)
 _shorten_path() {
-  local p="$1" max="$2" keep="${3:-1}"
+  local p="$1" max="${2:-50}"
+  (( ${#p} <= max )) && { echo "$p"; return; }
+
   local parts=("${(@s:/:)p}")
   local len=${#parts[@]}
 
-  # Need enough segments to shorten
-  if (( len < keep + 2 )); then
-    echo "$p"
-    return
-  fi
-
-  # Shorten segments after the kept ones, up to second-to-last
+  # Shorten from the first segment toward the last, keeping last 2 intact
   local i
-  for (( i=keep+1; i < len; i++ )); do
+  for (( i=1; i <= len - 2; i++ )); do
     (( ${#p} <= max )) && break
-    parts[$i]="${parts[$i]:0:1}"
+    # Don't shorten segments that are already 1-2 chars
+    (( ${#parts[$i]} <= 2 )) && continue
+    # Keep dot prefix for hidden dirs (e.g. .local → .l)
+    if [[ "${parts[$i]}" == .* ]]; then
+      parts[$i]=".${parts[$i]:1:1}"
+    else
+      parts[$i]="${parts[$i]:0:1}"
+    fi
     p="${(j:/:)parts}"
   done
   echo "$p"
 }
 
-# Smart directory display
-# - Worktrees:  ~/.local/share/worktrees/<org>/<repo>/<branch>[/...] → 🌿 <org(3)>/<repo>[/...]
-# - Desktop:    ~/desktop/...                                       → 🖥️ .../...
-# - Forges:     ~/src/github.com/org/repo/...                       → gh:org/repo/...
-#               ~/src/gitlab.com/org/repo/...                       → gl:org/repo/...
-#               ~/src/codeberg.org/org/repo/...                     → cb:org/repo/...
-# - Long paths: middle segments abbreviated to first letter
+# Smart directory display with path shortening
+# - All paths are shortened when > 50 chars (middle segments → first letter)
+# - Worktrees get a 🌲 prefix
+# - Desktop gets a 🖥️ prefix
 _prompt_dir() {
   local dir="${PWD/#$HOME/~}"
+  local prefix=""
 
-  # Worktrees: ~/.local/share/worktrees/<org>/<repo>/<branch>[/subdir...]
-  #   → 🌿 <org(3)>/<repo>[/subdir...] (branch already shown by git prompt)
-  if [[ "$dir" =~ '^~/.local/share/worktrees/([^/]+)/([^/]+)/[^/]+(/.*)?$' ]]; then
-    local org="${match[1]:0:3}"
-    local repo="${match[2]}"
-    local subdir="${match[3]}"
-    dir="🌿 ${org}/${repo}${subdir}"
-    if (( ${#dir} > 50 )); then
-      # Keep "🌿 org/repo" (first 2 real segments after emoji+space)
-      dir=$(_shorten_path "$dir" 50 2)
-    fi
-    echo "$dir"
-    return
+  # Worktrees: add 🌲 prefix
+  if [[ "$dir" =~ '^~/.local/share/worktrees/' ]]; then
+    prefix="🌳 "
+  # Desktop: add 🖥️ prefix
+  elif [[ "$dir" =~ '^~/desktop' ]]; then
+    prefix="🖥️ "
   fi
 
-  # Desktop: ~/desktop/... → 🖥️ ...
-  if [[ "$dir" =~ '^~/desktop(/.*)?$' ]]; then
-    local rest="${match[1]#/}"
-    if [[ -n "$rest" ]]; then
-      dir="🖥️ ${rest}"
-    else
-      dir="🖥️"
-    fi
-    if (( ${#dir} > 50 )); then
-      dir=$(_shorten_path "$dir" 50)
-    fi
-    echo "$dir"
-    return
-  fi
-
-  # Forges: ~/src/<forge>/org/repo/... → prefix:org/repo/...
-  if [[ "$dir" =~ '^~/src/github\.com/(.*)$' ]]; then
-    dir="gh:${match[1]}"
-  elif [[ "$dir" =~ '^~/src/gitlab\.com/(.*)$' ]]; then
-    dir="gl:${match[1]}"
-  elif [[ "$dir" =~ '^~/src/codeberg\.org/(.*)$' ]]; then
-    dir="cb:${match[1]}"
-  fi
-
-  # General: shorten if too long (keep prefix:org/repo = 2 segments for forges)
   if (( ${#dir} > 50 )); then
-    dir=$(_shorten_path "$dir" 50 2)
+    dir=$(_shorten_path "$dir" 50)
   fi
-  echo "$dir"
+  echo "${prefix}${dir}"
 }
 
 # Helper function to get git branch
@@ -104,8 +73,8 @@ _prompt_nix_shell() {
 # Helper function to show KUBECONFIG
 _prompt_kubeconfig() {
   if [[ -n $KUBECONFIG ]]; then
-    # Extract just the filename from the path for brevity
-    local kube_name=$(basename "$KUBECONFIG" .yaml)
+    local kube_name
+    kube_name=$(basename "$KUBECONFIG" .yaml)
     echo " %F{134}k8s:$kube_name%f"
   fi
 }