feat(rc): Improve fzf configuration

Without this, mise is not yet activated when evaluating the prefered
apps scripts and mise installed apps are considered not installed (for
exemple nvim for the EDITOR variable)

.gitmodules

@@ -4,3 +4,6 @@
 [submodule "3rd-party/complete-alias"]
 	path = 3rd-party/complete-alias
 	url = https://github.com/cykerway/complete-alias.git
+[submodule "3rd-party/junegunn/fzf-git.sh"]
+	path = 3rd-party/junegunn/fzf-git.sh
+	url = https://github.com/junegunn/fzf-git.sh

aliases.d/kitty

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# [ "$TERM" = "xterm-kitty" ] && alias ssh="kitty +kitten ssh"
+if [ -n "${KITTY_INSTALLATION_DIR}" ]; then
+  alias ssh="kitty +kitten ssh"
+  alias icat="kitty +kitten icat"
+fi

bash_profile

@@ -1,12 +1,50 @@
 #!/bin/bash
 
-if [ -f "$HOME"/.nix-profile/etc/profile.d/hm-session-vars.sh ]; then
-	source "$HOME"/.nix-profile/etc/profile.d/hm-session-vars.sh
+if [ -f "${HOME}"/.nix-profile/etc/profile.d/hm-session-vars.sh ]; then
+	source "${HOME}"/.nix-profile/etc/profile.d/hm-session-vars.sh
 fi
 
-if [ -f "$HOME"/.bash/profile ]; then source "$HOME"/.bash/profile; fi
-if [ -d "$HOME"/.bash/profile ]; then for file in "$HOME"/.bash/profile/*; do source "$file"; done; fi
-if [ -d "$HOME"/.bash/profile.d ]; then for file in "$HOME"/.bash/profile.d/*; do source "$file"; done; fi
+# Define the path to the directory of this file if not already set
+if [ -z "${BASH_CONFIG_DIR}" ]; then
+  # Define a function to get the real path of a script
+  # (works for most cases : either sourced script or executed script, posix shells)
+  get_script_dir() {
+    local target
+    # Si appelé depuis un script (Bash), on regarde qui a appelé la fonction (${BASH_SOURCE[1]})
+    # Si la fonction est exécutée directement dans le terminal, on se rabat sur ${BASH_SOURCE[0]} ou ${0}
+    if [ -n "${BASH_SOURCE}" ]; then
+      if [ "${#BASH_SOURCE[@]}" -gt 1 ]; then
+        target="${BASH_SOURCE[1]}"
+      else
+        target="${BASH_SOURCE[0]}"
+      fi
+    elif [ -n "${ZSH_VERSION}" ]; then
+      target="${(%):-%x}"
+    else
+      target="${0}"
+    fi
+
+    # Résolution des liens symboliques POSIX
+    while [ -L "${target}" ]; do
+      local link
+      link=$(readlink "${target}")
+      case "${link}" in
+        /*) target="${link}" ;;
+        *)  target="$(dirname "${target}")/${link}" ;;
+      esac
+    done
+
+    (cd "$(dirname "${target}")" && pwd -P)
+  }
+  BASH_CONFIG_DIR=$(get_script_dir)
+fi
+
+# Source some helpers functions
+source "${BASH_CONFIG_DIR}/_helpers.bash"
+
+_source_file_if_exists "${BASH_CONFIG_DIR}/profile"
+_source_dir_files "${BASH_CONFIG_DIR}/profile"
+_source_dir_files "${BASH_CONFIG_DIR}/profile.d"
 
 # This file is sourced by bash for login shells.  The following line
 # runs your .bashrc and is recommended by the bash info pages.

bashrc

@@ -13,49 +13,79 @@ fi
 
 # DEBUG_BASHRC=true
 
-# Determine path to directory of this file (FIX: remove dependency to readlink for posix compliance)
-BASEDIR=$(
-	source_file=$(readlink -f "${BASH_SOURCE[0]}")
-	source_dir=$(dirname "${source_file}")
-	cd "${source_dir}" && pwd
-)
+
+# Define the path to the directory of this file if not already set
+if [ -z "${BASH_CONFIG_DIR}" ]; then
+  # Define a function to get the real path of a script
+  # (works for most cases : either sourced script or executed script, posix shells)
+  get_script_dir() {
+    local target
+    # Si appelé depuis un script (Bash), on regarde qui a appelé la fonction (${BASH_SOURCE[1]})
+    # Si la fonction est exécutée directement dans le terminal, on se rabat sur ${BASH_SOURCE[0]} ou ${0}
+    if [ -n "${BASH_SOURCE}" ]; then
+      if [ "${#BASH_SOURCE[@]}" -gt 1 ]; then
+        target="${BASH_SOURCE[1]}"
+      else
+        target="${BASH_SOURCE[0]}"
+      fi
+    elif [ -n "${ZSH_VERSION}" ]; then
+      target="${(%):-%x}"
+    else
+      target="${0}"
+    fi
+
+    # Résolution des liens symboliques POSIX
+    while [ -L "${target}" ]; do
+      local link
+      link=$(readlink "${target}")
+      case "${link}" in
+        /*) target="${link}" ;;
+        *)  target="$(dirname "${target}")/${link}" ;;
+      esac
+    done
+
+    (cd "$(dirname "${target}")" && pwd -P)
+  }
+  BASH_CONFIG_DIR=$(get_script_dir)
+fi
 
 # Source some helpers functions
-source "${BASEDIR}/_helpers.bash"
+source "${BASH_CONFIG_DIR}/_helpers.bash"
 
 # Source custom libs
-_source_dir_files "${BASEDIR}"/libs
+_source_dir_files "${BASH_CONFIG_DIR}"/libs
 
 # Source 3rd party libs if they exists
-_source_file_if_exists "${BASEDIR}/3rd-party/complete-alias/complete_alias"
+_source_file_if_exists "${BASH_CONFIG_DIR}/3rd-party/complete-alias/complete_alias"
+_source_file_if_exists "${BASH_CONFIG_DIR}/3rd-party/junegunn/fzf-git.sh/fzf-git.sh"
 
 # Early customization
-_source_dir_files "${BASEDIR}"/rc.before.d
+_source_dir_files "${BASH_CONFIG_DIR}"/rc.before.d
 
 # Source rc.d/*
-_source_dir_files "${BASEDIR}"/rc
-_source_dir_files "${BASEDIR}"/rc.d
+_source_dir_files "${BASH_CONFIG_DIR}"/rc
+_source_dir_files "${BASH_CONFIG_DIR}"/rc.d
 
 # Source functions definitions
 _source_file_if_exists ~/.bash_functions
-_source_file_if_exists "${BASEDIR}"/functions
-_source_dir_files "${BASEDIR}"/functions
-_source_dir_files "${BASEDIR}"/functions.d
+_source_file_if_exists "${BASH_CONFIG_DIR}"/functions
+_source_dir_files "${BASH_CONFIG_DIR}"/functions
+_source_dir_files "${BASH_CONFIG_DIR}"/functions.d
 
 # Source alias definitions
 _source_file_if_exists ~/.bash_aliases
-_source_file_if_exists "${BASEDIR}"/aliases
-_source_dir_files "${BASEDIR}"/aliases
-_source_dir_files "${BASEDIR}"/aliases.d
+_source_file_if_exists "${BASH_CONFIG_DIR}"/aliases
+_source_dir_files "${BASH_CONFIG_DIR}"/aliases
+_source_dir_files "${BASH_CONFIG_DIR}"/aliases.d
 
 # Source bash completion definitions
 # TODO: Améliorer cette partie pour éviter les erreurs quand aucun fichier n'existe
 for file in /etc/bash*completion /etc/profile.d/bash*completion*; do source "$file"; done
 
 _source_file_if_exists ~/.bash_completion
-_source_file_if_exists "${BASEDIR}"/completion
-_source_dir_files "${BASEDIR}"/completion
-_source_dir_files "${BASEDIR}"/completion.d
+_source_file_if_exists "${BASH_CONFIG_DIR}"/completion
+_source_dir_files "${BASH_CONFIG_DIR}"/completion
+_source_dir_files "${BASH_CONFIG_DIR}"/completion.d
 _source_dir_files ~/.nix-profile/share/bash-completion/completions
 
 if (command -v _complete_alias &>/dev/null); then
@@ -63,4 +93,4 @@ if (command -v _complete_alias &>/dev/null); then
 fi
 
 # Late customization
-_source_dir_files "${BASEDIR}"/rc.after.d
+_source_dir_files "${BASH_CONFIG_DIR}"/rc.after.d

completion.d/flux

@@ -1,4 +1,3 @@
-
 #!/bin/bash
 
 if (command -v flux &>/dev/null); then

completion.d/tea

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+if (command -v tea &>/dev/null); then
+	source <(tea completion bash)
+fi

create-links.bash

@@ -1,11 +1,43 @@
 #!/bin/bash
 
-cd $HOME || exit 1
+# Define the path to the directory of this file if not already set
+if [ -z "${BASH_CONFIG_DIR}" ]; then
+  # Define a function to get the real path of a script
+  # (works for most cases : either sourced script or executed script, posix shells)
+  get_script_dir() {
+    local target
+    # Si appelé depuis un script (Bash), on regarde qui a appelé la fonction (${BASH_SOURCE[1]})
+    # Si la fonction est exécutée directement dans le terminal, on se rabat sur ${BASH_SOURCE[0]} ou ${0}
+    if [ -n "${BASH_SOURCE}" ]; then
+      if [ "${#BASH_SOURCE[@]}" -gt 1 ]; then
+        target="${BASH_SOURCE[1]}"
+      else
+        target="${BASH_SOURCE[0]}"
+      fi
+    elif [ -n "${ZSH_VERSION}" ]; then
+      target="${(%):-%x}"
+    else
+      target="${0}"
+    fi
 
-CONFDIR=.bash
+    # Résolution des liens symboliques POSIX
+    while [ -L "${target}" ]; do
+      local link
+      link=$(readlink "${target}")
+      case "${link}" in
+        /*) target="${link}" ;;
+        *)  target="$(dirname "${target}")/${link}" ;;
+      esac
+    done
 
-ln -sf $CONFDIR/bash_profile .bash_profile
-ln -sf $CONFDIR/bashrc .bashrc
-ln -sf $CONFDIR/bash_logout .bash_logout
+    (cd "$(dirname "${target}")" && pwd -P)
+  }
+  BASH_CONFIG_DIR=$(get_script_dir)
+fi
 
-ln -sf $CONFDIR/inputrc .inputrc
+cd "${HOME}" || exit 1
+
+ln -sf "${BASH_CONFIG_DIR}"/bash_profile .bash_profile
+ln -sf "${BASH_CONFIG_DIR}"/bashrc .bashrc
+ln -sf "${BASH_CONFIG_DIR}"/bash_logout .bash_logout
+ln -sf "${BASH_CONFIG_DIR}"/inputrc .inputrc

inputrc

@@ -1,65 +0,0 @@
-# Include system config file
-$include /etc/inputrc
-
-# do not bell on tab-completion
-set bell-style none
-
-# Disable display of ^C
-set echo-control-characters off
-
-# Completion options
-set show-all-if-ambiguous on
-set show-all-if-unmodified on
-
-# History
-"\e[A": history-search-backward
-"\e[B": history-search-forward
-
-# backword/forward during search history
-"\eq":backward-search-history
-"\es":forward-search-history
-
-# Alt+w Alt+x for beginning/end of line
-"\ew":"\C-a"
-"\ex":"\C-e"
-
-# prepend "tail -f " with Ctrl+Alt+f
-"\e\C-f":"\C-atail -f "
-"\ef":"\C-atail -f "
-
-# prepend "sudo " with Ctrl+Alt+s
-"\e\C-s":"\C-asudo "
-"\es":"\C-asudo "
-
-# prepend "yes | " with Ctrl+Alt+y
-"\e\C-y":"\C-ayes | "
-"\ey":"\C-ayes | "
-
-# append " | grep" with Ctrl+Alt+g
-"\e\C-g":"\C-e | grep "
-"\eg":"\C-e | grep "
-
-# append " | head" with Ctrl+Alt+h
-"\e\C-h":"\C-e | head"
-"\eh":"\C-e | head"
-
-# append " | tail" with Ctrl+Alt+t
-"\e\C-t":"\C-e | tail"
-"\et":"\C-e | tail"
-
-# append " | more" with Ctrl+Alt+m
-"\e\C-m":"\C-e | more"
-"\em":"\C-e | more"
-
-# append " | less" with Ctrl+Alt+l
-"\e\C-l":"\C-e | less"
-"\el":"\C-e | less"
-# we can add \C-m add the end to validate command too
-#"\e\C-m":"\C-e | less\C-m"
-
-# prepend "man " with F1 and validate
-"\e[11~":"\C-aman \C-m"
-
-# Launch commands with <F2> then letter
-"\e[12~i":"\C-k\C-uirssi\C-m"
-"\e[12~m":"\C-k\C-umutt\C-m"

libs/colors.bash

@@ -64,6 +64,18 @@ function echo_error { >&2 echo -e "\e[00;01;31;49m  ${*}\e[39;49;00m"; }
 function echo_success { >&2 echo -e "\e[00;01;32;49m ${*}\e[39;49;00m"; }
 function echo_failed { >&2 echo -e "\e[00;01;31;49m✖ ${*}\e[39;49;00m"; }
 
+function echo_verbose {
+  if [ -n "${VERBOSE}" ]; then
+    echo_faint "${*}" >&2
+  fi
+}
+
+function echo_debug {
+  if [ -n "${DEBUG}" ]; then
+    echo_faint "🐛 ${*}" >&2
+  fi
+}
+
 function echo_demo {
   echo_bold bold
   echo_faint faint
@@ -77,4 +89,5 @@ function echo_demo {
   echo_error error
   echo_success success
   echo_failed failed
+  DEBUG=true echo_debug debug
 }

profile.d/lang

@@ -1,4 +1,4 @@
 #!/bin/bash
 
 # Define prefered LANG
-export LANG=fr_FR.utf8
+export LANG=fr_FR.UTF-8

rc.d/fzf

@@ -2,30 +2,70 @@
 
 if (command -v fzf &>/dev/null); then
 
+  # Shell integration
   source <(fzf --bash)
 
-  # Selection de fichiers
-  export FZF_CTRL_T_OPTS="--height 60% \
---border sharp \
---layout reverse \
---prompt '󰈞 ' \
---pointer ❯ \
---marker ✔"
+  # Options par défaut
+  FZF_DEFAULT_OPTS="\
+  --height 60%
+  --border rounded
+  --layout reverse
+  --highlight-line \
+  --info=inline-right \
+  --ansi \
+  "
+  export FZF_DEFAULT_OPTS
 
   # Navigation vers un répertoire
-  export FZF_ALT_C_OPTS="--height 60% \
---border sharp \
---layout reverse \
---prompt '󰥨 ' \
---pointer ❯ \
---marker ✔"
+  FZF_ALT_C_OPTS="$(
+    cat <<'EOF'
+      --prompt '󰥨  '
+      --pointer ❯
+      --marker ✔
+EOF
+  )"
+  export FZF_ALT_C_OPTS
+
+  # Selection de fichiers
+  FZF_CTRL_T_OPTS="$(
+    cat <<'EOF'
+      --prompt '󰈞  '
+      --pointer ❯
+      --marker ✔
+      --preview="bat --color=always --style=-header {}"
+EOF
+  )"
+  export FZF_CTRL_T_OPTS
 
   # Navigation dans l'historique
-  export FZF_CTRL_R_OPTS="--height 60% \
---border sharp \
---layout reverse \
---prompt ' ' \
---pointer ❯ \
---marker ✔"
+  FZF_CTRL_R_OPTS="$(
+    cat <<'EOF'
+      --prompt '  '
+      --pointer ❯
+      --marker ✔
+EOF
+  )"
+  export FZF_CTRL_R_OPTS
+
+  # Theme tokyonight
+  FZF_DEFAULT_OPTS="${FZF_DEFAULT_OPTS} \
+  --color=bg+:#283457 \
+  --color=bg:#16161e \
+  --color=border:#27a1b9 \
+  --color=fg:#c0caf5 \
+  --color=gutter:#16161e \
+  --color=header:#ff9e64 \
+  --color=hl+:#2ac3de \
+  --color=hl:#2ac3de \
+  --color=info:#545c7e \
+  --color=marker:#ff007c \
+  --color=pointer:#ff007c \
+  --color=prompt:#2ac3de \
+  --color=query:#c0caf5:regular \
+  --color=scrollbar:#27a1b9 \
+  --color=separator:#ff9e64 \
+  --color=spinner:#ff007c \
+  "
+  export FZF_DEFAULT_OPTS
 
 fi

rc.d/prompt

@@ -2,28 +2,37 @@
 
 # Customize the prompt
 
-USE_PROMPT=powerline-go
+# Indicate your preference order for prompt tools
+# The first one found available will be used
+MY_PROMPTS="starship powerline-go"
 
-case "$USE_PROMPT" in
+for prompt in $MY_PROMPTS; do
+	if (command -v "$prompt" &>/dev/null); then
+		USE_PROMPT="$prompt"
+		break
+	fi
+done
 
+case "${USE_PROMPT}" in
+
+# https://starship.rs/
 "starship")
 	if (command -v starship &>/dev/null); then
-		# echo "Using $USE_PROMPT prompt"
 		eval "$(starship init bash)"
 	else
-		echo "$USE_PROMPT command not found"
+		echo "${USE_PROMPT} command not found"
 	fi
 	;;
 
+# https://github.com/justjanne/powerline-go
 "powerline-go")
 	if (command -v powerline-go &>/dev/null); then
-		# echo "Using $USE_PROMPT prompt"
 		function _update_ps1() {
 			PS1=$(powerline-go -jobs "$(jobs -p | wc -l)" -error $? -modules "ssh,host,wsl,user,cwd,direnv,venv,perms,git,jobs,exit,root" -modules-right "docker,docker-context,kube,terraform-workspace,termtitle" -newline)
 		}
 		if [ "$TERM" != "linux" ]; then _prompt_command_add "_update_ps1"; fi
 	else
-		echo "$USE_PROMPT command not found"
+		echo "${USE_PROMPT} command not found"
 	fi
 	;;
 

rc.d/terminal-title

@@ -0,0 +1,49 @@
+#!/bin/bash
+
+# Function to update terminal/tmux title
+_update_terminal_title() {
+  local kubecontext dir gitrepo gitremote icon title
+
+  # Detect Kubernetes context (if kubectl is available)
+  if [ -n "${KUBECONFIG}" ]; then
+    if command -v kubectl >/dev/null 2>&1; then
+      kubecontext=$(kubectl config current-context 2>/dev/null)
+      if [ -n "$kubecontext" ]; then
+        title="󱃾 ${kubecontext}"
+      fi
+    fi
+  fi
+
+  # If no title is already set, check if we're in $HOME
+  if [ -z "${title}" ] && [ "$PWD" = "$HOME" ]; then
+    title="󱂵 ~"
+  fi
+
+  # If we're in a git repo display repo name with a nice icon
+  if [ -z "${title}" ] && gitrepo=$(git rev-parse --show-toplevel 2>/dev/null); then
+    dir=$(basename "${gitrepo}")
+
+    # Detect host from remote URL
+    gitremote=$(git remote get-url origin 2>/dev/null)
+    case "${gitremote}" in
+    *github.com*) icon="" ;; # nf-fa-github
+    *gitlab.com*) icon="" ;; # nf-fa-gitlab
+    *gitea*) icon="" ;;      # nf-linux-gitea
+    *) icon="" ;; # nf-dev-git
+    esac
+
+    title="${icon} ${dir}"
+  fi
+
+  # Set the title in tmux or terminal window
+  if [ -n "${title}" ]; then
+    if [ -n "$TMUX" ]; then
+      tmux rename-window "${title}"
+    else
+      printf '\033]0;%s\007' "${title}"
+    fi
+  fi
+}
+
+# Add the function to the PROMPT_COMMAND variable to have regular updates
+if [ "$TERM" != "linux" ]; then _prompt_command_add "_update_terminal_title"; fi

rc.d/vivid

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# INFO:
+#  vivid is a generator for the LS_COLORS environment variable that controls the colorized output of ls, tree, fd, bfs, dust and many other tools.
+# ➜ https://github.com/sharkdp/vivid
+# 💡Use command `vivid themes` to see available themes
+
+if (command -v vivid &>/dev/null); then
+  THEME=tokyonight-moon
+  LS_COLORS="$(vivid generate ${THEME})"
+  export LS_COLORS
+fi