config: 🛠️ tmux config modifications

Author: assafdori

tmux/scripts/git-status.sh

@@ -0,0 +1,91 @@
+#!/usr/bin/env bash
+
+CURRENT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$CURRENT_DIR/../lib/coreutils-compat.sh"
+source "$CURRENT_DIR/themes.sh"
+
+cd "$1" || exit 1
+RESET="#[fg=${THEME[foreground]},bg=${THEME[background]},nobold,noitalics,nounderscore,nodim]"
+BRANCH=$(git rev-parse --abbrev-ref HEAD 2>/dev/null)
+STATUS=$(git status --porcelain 2>/dev/null | grep -cE "^(M| M)")
+
+SYNC_MODE=0
+NEED_PUSH=0
+
+if [[ ${#BRANCH} -gt 25 ]]; then
+  BRANCH="${BRANCH:0:25}…"
+fi
+
+STATUS_CHANGED=""
+STATUS_INSERTIONS=""
+STATUS_DELETIONS=""
+STATUS_UNTRACKED=""
+
+if [[ $STATUS -ne 0 ]]; then
+  DIFF_COUNTS=($(git diff --numstat 2>/dev/null | awk 'NF==3 {changed+=1; ins+=$1; del+=$2} END {printf("%d %d %d", changed, ins, del)}'))
+  CHANGED_COUNT=${DIFF_COUNTS[0]}
+  INSERTIONS_COUNT=${DIFF_COUNTS[1]}
+  DELETIONS_COUNT=${DIFF_COUNTS[2]}
+
+  SYNC_MODE=1
+fi
+
+UNTRACKED_COUNT="$(git ls-files --other --directory --exclude-standard | wc -l | bc)"
+
+if [[ $CHANGED_COUNT -gt 0 ]]; then
+  STATUS_CHANGED="${RESET}#[fg=${THEME[yellow]},bg=${THEME[background]},bold] ${CHANGED_COUNT} "
+fi
+
+if [[ $INSERTIONS_COUNT -gt 0 ]]; then
+  STATUS_INSERTIONS="${RESET}#[fg=${THEME[green]},bg=${THEME[background]},bold] ${INSERTIONS_COUNT} "
+fi
+
+if [[ $DELETIONS_COUNT -gt 0 ]]; then
+  STATUS_DELETIONS="${RESET}#[fg=${THEME[red]},bg=${THEME[background]},bold] ${DELETIONS_COUNT} "
+fi
+
+if [[ $UNTRACKED_COUNT -gt 0 ]]; then
+  STATUS_UNTRACKED="${RESET}#[fg=${THEME[foreground]},bg=${THEME[background]},bold] ${UNTRACKED_COUNT} "
+fi
+
+# Determine repository sync status
+if [[ $SYNC_MODE -eq 0 ]]; then
+  NEED_PUSH=$(git log @{push}.. | wc -l | bc)
+  if [[ $NEED_PUSH -gt 0 ]]; then
+    SYNC_MODE=2
+  else
+    LAST_FETCH=$(stat -c %Y .git/FETCH_HEAD | bc)
+    NOW=$(date +%s | bc)
+
+    # if 5 minutes have passed since the last fetch
+    if [[ $((NOW - LAST_FETCH)) -gt 300 ]]; then
+      git fetch --atomic origin --negotiation-tip=HEAD
+    fi
+
+    # Check if the remote branch is ahead of the local branch
+    REMOTE_DIFF="$(git diff --numstat "${BRANCH}" "origin/${BRANCH}" 2>/dev/null)"
+    if [[ -n $REMOTE_DIFF ]]; then
+      SYNC_MODE=3
+    fi
+  fi
+fi
+
+# Set the status indicator based on the sync mode
+case "$SYNC_MODE" in
+1)
+  REMOTE_STATUS="$RESET#[bg=${THEME[background]},fg=${THEME[bred]},bold]▒ 󱓎"
+  ;;
+2)
+  REMOTE_STATUS="$RESET#[bg=${THEME[background]},fg=${THEME[red]},bold]▒ 󰛃"
+  ;;
+3)
+  REMOTE_STATUS="$RESET#[bg=${THEME[background]},fg=${THEME[magenta]},bold]▒ 󰛀"
+  ;;
+*)
+  REMOTE_STATUS="$RESET#[bg=${THEME[background]},fg=${THEME[green]},bold]▒ "
+  ;;
+esac
+
+if [[ -n $BRANCH ]]; then
+  echo "$REMOTE_STATUS $RESET$BRANCH $STATUS_CHANGED$STATUS_INSERTIONS$STATUS_DELETIONS$STATUS_UNTRACKED"
+fi

tmux/tmux.conf

@@ -70,18 +70,18 @@ set -ga update-environment FZF_DEFAULT_OPTS
 # Status Line and Theming
 #--------------------------------------------------------------------------
 # Define color variables
-thm_bg="default"
-thm_bg_dark="default"
-thm_fg="#c0caf5"
-thm_gray="#9499b8"
-thm_magenta="#bb9af7"
-thm_pink="#ff007c"
-thm_green="#9ece6a"
-thm_blue="#2ac3de"
-thm_black="#414868"
-thm_yellow="#e0af68"
-thm_selected="#364a82"
-thm_match="#3d59a1"
+thm_bg="default"          # keep, uses terminal/bg
+thm_bg_dark="default"     # same
+thm_fg="#c5c8c9"          # light foreground (no-clown-fiesta fg1)
+thm_gray="#7c7f93"        # muted gray
+thm_magenta="#b77ee0"     # violet/purple accent
+thm_pink="#e46876"        # wave red/pink accent
+thm_green="#87a35e"       # autumn green
+thm_blue="#7aa89f"        # wave aqua (soft teal-blue)
+thm_black="#1b1d26"       # sumiInk background tone
+thm_yellow="#e6c384"      # carp yellow
+thm_selected="#2d353b"    # selection (sumiInk3)
+thm_match="#a3d4d5"       # crystal aqua highlight
 
 # Enable status line and position it
 set -g status "on"
@@ -91,20 +91,21 @@ set -g status-style 'fg=white'
 
 # Window/pane border styles
 set -g pane-border-style "fg=#2c2f3d,bg=default"
-set -g pane-active-border-style "fg=${thm_match}"
+set -g pane-active-border-style "fg=${thm_gray}"
 set -gw pane-border-indicators 'colour'
 set -g window-status-activity-style "none"
 set-hook -g -w pane-focus-in "set-option -Fw pane-border-status '#{?#{e|>:#{window_panes},1},top,off}'"
+set -g pane-border-format "#H"
 
 
 # Status left: session name
-set -g status-left "#[fg=#{?client_prefix,${thm_yellow},${thm_fg}},bg=${thm_bg_dark}]#S#[fg=${thm_fg},bg=default] ▸ "
+set -g status-left " #[fg=#{?client_prefix,${thm_yellow},${thm_fg}},bg=${thm_bg_dark}]#S#[fg=${thm_fg},bg=default]  "
 
 # Status left length
 set -g status-left-length 30
 
 # Status right: Disabled for now
-set -g status-right ""
+set -g status-right '#{?#{==:#{pane_current_command},nvim},#($HOME/.config/tmux/scripts/git-status.sh #{pane_current_path}),}'
 
 # Update status interval
 set -g status-interval 1
@@ -207,10 +208,6 @@ bind y run -b "tmux show-buffer | pbcopy" \; display-message "copied tmux buffer
 bind-key B break-pane -d
 bind-key E command-prompt -p "join pane from: " "join-pane -h -s '%%'"
 
-# Toggle tmux status bar top/bottom
-bind-key C-k run-shell "tmux set-option -g status-position top;"
-bind-key C-j run-shell "tmux set-option -g status-position bottom;"
-
 # Opencode popup menu
 bind o popup -E -d "#{pane_current_path}" -w 90% -h 90% "opencode"
 bind O new-window -n " opencode" -c "#{pane_current_path}" "opencode"
@@ -219,7 +216,7 @@ bind O new-window -n " opencode" -c "#{pane_current_path}" "opencode"
 # Sesh Integration
 #--------------------------------------------------------------------------
 bind-key "T" run-shell "sesh connect \"$(
-  sesh list --icons | fzf-tmux -p 55%,60% \
+  sesh list --icons | fzf-tmux -p 80%,60% \
     --no-sort --ansi --border-label ' sesh ' --prompt '⚡  ' \
     --header '  ^a all ^t tmux ^g configs ^x zoxide ^d tmux kill ^f find' \
     --bind 'tab:down,btab:up' \
@@ -229,14 +226,29 @@ bind-key "T" run-shell "sesh connect \"$(
     --bind 'ctrl-x:change-prompt(📁  )+reload(sesh list -z --icons)' \
     --bind 'ctrl-f:change-prompt(🔎  )+reload(fd -H -d 2 -t d -E .Trash . ~)' \
     --bind 'ctrl-d:execute(tmux kill-session -t {2..})+change-prompt(⚡  )+reload(sesh list --icons)' \
-    --preview-window 'right:55%' \
+    --preview-window 'right:0%' \
     --preview 'sesh preview {}'
 )\""
 
+# Find and jump to window
+bind f display-popup -E "\
+    tmux list-windows -F '#{window_index} #{window_name}' |\
+    sed '/^$/d' |\
+    fzf --reverse --header select-window |\
+    cut -d ' ' -f 1 |\
+    xargs tmux select-window -t"
+
+# Find and jump to session
+bind e display-popup -E "\
+    tmux list-sessions -F '#{?session_attached,,#{session_name}}' |\
+    sed '/^$/d' |\
+    fzf --reverse --header select-session |\
+    xargs tmux switch-client -t"
+
 #--------------------------------------------------------------------------
 # List Panes Integration
 # --------------------------------------------------------------------------
-bind-key f run-shell -b "$HOME/.config/tmux/scripts/list-panes.sh"
+# bind-key f run-shell -b "$HOME/.config/tmux/scripts/list-panes.sh"
 
 #--------------------------------------------------------------------------
 # Plugins