feat(libs): Prise en compte de tmux dans la fonction term_change_title

Ajout de l'alias lt pour `lsd --tree` qui est un équivalent de la
commande `tree`.

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "3rd-party/z"]
+	path = 3rd-party/z
+	url = https://github.com/rupa/z.git
+[submodule "3rd-party/complete-alias"]
+	path = 3rd-party/complete-alias
+	url = https://github.com/cykerway/complete-alias.git

_helpers.bash

@@ -0,0 +1,44 @@
+#!/bin/bash
+
+function basedir() {
+	(cd "$(dirname \"$-2\")" && pwd)
+}
+
+function _source_file_if_exists() {
+	if [ -r "$1" ]; then
+		test -n "$DEBUG_BASHRC" && echo "-- Sourcing file $1"
+		source "$1"
+	fi
+}
+
+function _source_dir_files() {
+	if [ -d "$1" ]; then
+		test -n "$DEBUG_BASHRC" && echo "-- Sourcing files in directory $1"
+
+		# Safe loops for empty dirs
+		shopt -s nullglob
+
+		for file in "$1"/*; do
+			if [ -e "$file" ]; then
+				test -n "$DEBUG_BASHRC" && echo "    * sourcing file $file"
+				source "$file"
+			fi
+		done
+
+		# Restore option nullglob to normal
+		shopt -u nullglob
+	fi
+}
+
+# Source : https://superuser.com/questions/39751/add-directory-to-path-if-its-not-already-there
+_path_add() {
+	if [ -d "$1" ] && [[ ":$PATH:" != *":$1:"* ]]; then
+		PATH="${PATH:+"$PATH:"}$1"
+	fi
+}
+
+_prompt_command_add() {
+	if [ -n "$1" ] && [[ ":$PROMPT_COMMAND:" != *":$1:"* ]]; then
+		PROMPT_COMMAND="${PROMPT_COMMAND:+"$PROMPT_COMMAND;"}$1"
+	fi
+}

aliases.d/bat

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+if (command -v bat &>/dev/null); then
+  alias cat=bat
+fi

aliases.d/kubectl

@@ -6,10 +6,16 @@ if (command -v kubectl &>/dev/null); then
 	alias k="kubectl"
 	alias kg="kubectl get"
 	alias kd="kubectl describe"
+
 	alias ks="kubectl --namespace kube-system"
+	alias ksg="kubectl --namespace kube-system get"
+	alias ksd="kubectl --namespace kube-system describe"
 	alias kga="kubectl get --all-namespaces"
 	alias kuc="kubectl config unset current-context"
 	alias kun="kubectl config set-context --current --namespace="
-	alias kgworkers="kubectl get nodes --selector '!node-role.kubernetes.io/control-plane' --label-columns heat,topology.kubernetes.io/zone,topology.kubernetes.io/region --sort-by metadata.labels.heat"
 
+	alias kgnodes="kubectl get nodes --label-columns topology.kubernetes.io/region,topology.kubernetes.io/zone"
+	alias kgmasters="kubectl get nodes --selector 'node-role.kubernetes.io/control-plane' --label-columns topology.kubernetes.io/region,topology.kubernetes.io/zone"
+	alias kgworkers="kubectl get nodes --selector '!node-role.kubernetes.io/control-plane' --label-columns topology.kubernetes.io/region,topology.kubernetes.io/zone"
+	alias kgtaints="kubectl get nodes --output custom-columns=NAME:.metadata.name,TAINTS:.spec.taints"
 fi

aliases.d/lsd

@@ -2,5 +2,6 @@
 
 if (command -v lsd &> /dev/null)
 then
-  alias ls=lsd
+  alias ls='lsd'
+  alias lt='lsd --tree'
 fi

bash_profile

@@ -1,6 +1,8 @@
 #!/bin/bash
 
-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

bashrc

@@ -11,37 +11,51 @@ if [[ $- != *i* ]]; then
 	return
 fi
 
-# Safe loops for empty dirs
+# DEBUG_BASHRC=true
-shopt -s nullglob
+
+# 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
+)
+
+# Source some helpers functions
+source "${BASEDIR}/_helpers.bash"
 
 # Source custom libs
-if [ -d "$HOME"/.bash/libs ]; then for lib in "$HOME"/.bash/libs/*.bash; do source "$lib"; done; fi
+_source_dir_files "${BASEDIR}"/libs
+
+# Source 3rd party libs if they exists
+_source_file_if_exists "${BASEDIR}/3rd-party/complete-alias/complete_alias"
+# _source_file_if_exists "${BASEDIR}/3rd-party/z/z.sh" # FIX: Problème de gestion de la variable PROMPT_COMMAND
 
 # Early customization
-if [ -d "$HOME"/.bash/rc.before.d ]; then for file in "$HOME"/.bash/rc.before.d/*; do source "$file"; done; fi
+_source_dir_files "${BASEDIR}"/rc.before.d
 
 # Source rc.d/*
-if [ -d "$HOME"/.bash/rc.d ]; then for file in "$HOME"/.bash/rc.d/*; do source "$file"; done; fi
+_source_dir_files "${BASEDIR}"/rc
+_source_dir_files "${BASEDIR}"/rc.d
 
 # Source alias definitions
-if [ -f "$HOME"/.bash_aliases ]; then source "$HOME"/.bash_aliases; fi
+_source_file_if_exists ~/.bash_aliases
-if [ -f "$HOME"/.bash/aliases ]; then source "$HOME"/.bash/aliases; fi
+_source_file_if_exists "${BASEDIR}"/aliases
-if [ -d "$HOME"/.bash/aliases ]; then for file in "$HOME"/.bash/aliases/*; do source "$file"; done; fi
+_source_dir_files "${BASEDIR}"/aliases
-if [ -d "$HOME"/.bash/aliases.d ]; then for file in "$HOME"/.bash/aliases.d/*; do source "$file"; done; fi
+_source_dir_files "${BASEDIR}"/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_dir_files ~/.nix-profile/share/bash-completion/completions
+
 if (command -v _complete_alias &>/dev/null); then
 	for alias in $(alias -p | awk '{print $2}' | awk -F= '{print $1}'); do complete -o default -F _complete_alias "$alias"; done
 fi
 
-# Source bash completion definitions
-for file in /etc/bash*completion /etc/profile.d/bash*completion*; do source "$file"; done
-
-if [ -f "$HOME"/.bash_completion ]; then source "$HOME"/.bash_completion; fi
-if [ -f "$HOME"/.bash/completion ]; then source "$HOME"/.bash/completion; fi
-if [ -d "$HOME"/.bash/completion ]; then for file in "$HOME"/.bash/completion/*; do source "$file"; done; fi
-if [ -d "$HOME"/.bash/completion.d ]; then for file in "$HOME"/.bash/completion.d/*; do source "$file"; done; fi
-
 # Late customization
-if [ -d "$HOME"/.bash/rc.after.d ]; then for file in "$HOME"/.bash/rc.after.d/*; do source "$file"; done; fi
+_source_dir_files "${BASEDIR}"/rc.after.d
-
-# Restore option nullglob to normal
-shopt -u nullglob

completion.d/aws

@@ -1,6 +1,5 @@
 #!/bin/bash
 
-if ( which aws && which aws_completer ) &> /dev/null
+if (command -v aws && command -v aws_completer) &>/dev/null; then
-then
   complete -C aws_completer aws
 fi

completion.d/chezmoi

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

completion.d/flux

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

completion.d/glab

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

completion.d/k3d

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

completion.d/minikube

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

completion.d/mise

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

libs/colors.bash

@@ -30,6 +30,12 @@
 #48   Subscript
 #49   Superscript
 
+#bold_on=`escape 1m`
+#bold_off=`escape 22m`
+#blink_on=`escape 5m`
+#blink_off=`escape 25m`
+#reset=`escape 0m`
+
 #T_ROWS=`tput lines`        #  Define current terminal dimension
 #T_COLS=`tput cols`         #+ in rows and columns.
 #_UNDERLINE_ON=`tput smul`   # turn on underline
@@ -42,53 +48,33 @@
 #tput rev - Display inverse colors
 #tput sgr0 - Reset everything
 
-default='\E[39;49;00m'
+# Affiche un message stylisé sur la sortie standard
-bold='\E[1m'
+function echo_bold { echo -e "\e[1m${*}\e[0m"; }
-italic='\E[3m'
+function echo_faint { echo -e "\e[2m${*}\e[0m"; }
-underline='\E[4m'
+function echo_italic { echo -e "\e[3m${*}\e[0m"; }
-blink='\E[5m'
+function echo_underline { echo -e "\e[4m${*}\e[0m"; }
+function echo_blink { echo -e "\e[5m${*}\e[0m"; }
+function echo_reverse { echo -e "\e[7m${*}\e[0m"; }
+function echo_concealed { echo -e "\e[8m${*}\e[0m"; }
 
-blackonwhite='\E[30;47m'
+# Affiche un message informatif stylisé sur la sortie d'erreur
+function echo_info { >&2 echo -e "\e[00;34;49m󰋼  ${*}\e[39;49;00m"; }
+function echo_warning { >&2 echo -e "\e[00;33;49m  ${*}\e[39;49;00m"; }
+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"; }
 
-#reset=`escape 0m`
+function echo_demo {
-#black='\E[30;47m'
+  echo_bold bold
-#red='\E[31;47m'
+  echo_faint faint
-#green='\E[32;47m'
+  echo_italic italic
-#yellow='\E[33;47m'
+  echo_underline underline
-#blue='\E[34;47m'
+  echo_blink blink
-#magenta='\E[35;47m'
+  echo_reverse reverse
-#cyan='\E[36;47m'
+  echo_concealed concealed
-#white='\E[37;47m'
+  echo_info info
-#bold_on=`escape 1m`
+  echo_warning warning
-#bold_off=`escape 22m`
+  echo_error error
-#blink_on=`escape 5m`
+  echo_success success
-#blink_off=`escape 25m`
+  echo_failed failed
-
-
-function echo_reverse
-{
-  echo -ne $blackonwhite
-  echo -ne "$*"
-  echo -e $default
-}
-
-function echo_italic
-{
-  echo -ne $italic
-  echo -ne "$*"
-  echo -e $default
-}
-
-function echo_bold
-{
-  echo -ne $bold
-  echo -ne "$*"
-  echo -e $default
-}
-
-function echo_underline
-{
-  echo -ne $underline
-  echo -ne "$*"
-  echo -e $default
 }

libs/term.bash

@@ -1,15 +1,14 @@
 #!/bin/bash
 
-function term_change_title
+function term_change_title {
-{
 	case $TERM in
 	# Change the window title of X terminals
-		xterm*|rxvt*|urxvt*|Eterm)
+	xterm* | rxvt* | urxvt* | Eterm)
 		echo -ne "\033]0;${1}\007"
 		;;
 
 	# Change the window title of screen terminals
-		screen*)
+	screen* | tmux*)
 		echo -ne "\033k${1}\033\\"
 		;;
 	esac

profile.d/apps

@@ -8,7 +8,9 @@ if (command -v nvim &>/dev/null); then
 fi
 
 # PAGER
-export PAGER=less
+if (command -v less &>/dev/null); then
+	export PAGER=less
+fi
 
 # MANPAGER
 if (command -v nvim &>/dev/null); then
@@ -18,7 +20,11 @@ elif (command -v bat &>/dev/null); then
 fi
 
 # TERMINAL
-export TERMINAL=kitty
+if (command -v kitty &>/dev/null); then
+	export TERMINAL=kitty
+fi
 
 # BROWSER
-export BROWSER=firefox
+if (command -v firefox &>/dev/null); then
+	export BROWSER=firefox
+fi

profile.d/keychain

@@ -1,6 +1,5 @@
 #!/bin/bash
 
-if $(which keychain &> /dev/null)
+if (command -v keychain &>/dev/null); then
-then
+  eval "$(keychain --eval --noask ~/.ssh/{id_ed25519,id_rsa_native})"
-  eval $(keychain --agents ssh,gpg --eval)
 fi

rc.d/anyenv

@@ -4,7 +4,6 @@
 
 # git clone https://github.com/riywo/anyenv $HOME/.anyenv
 
-if ( which anyenv &> /dev/null )
+if (which anyenv &>/dev/null); then
-then
   eval "$(anyenv init -)"
 fi

rc.d/fzf

@@ -0,0 +1,31 @@
+#!/bin/bash
+
+if (command -v fzf &>/dev/null); then
+
+  source <(fzf --bash)
+
+  # Selection de fichiers
+  export FZF_CTRL_T_OPTS="--height 60% \
+--border sharp \
+--layout reverse \
+--prompt '󰈞 ' \
+--pointer ❯ \
+--marker ✔"
+
+  # Navigation vers un répertoire
+  export FZF_ALT_C_OPTS="--height 60% \
+--border sharp \
+--layout reverse \
+--prompt '󰥨 ' \
+--pointer ❯ \
+--marker ✔"
+
+  # Navigation dans l'historique
+  export FZF_CTRL_R_OPTS="--height 60% \
+--border sharp \
+--layout reverse \
+--prompt ' ' \
+--pointer ❯ \
+--marker ✔"
+
+fi

rc.d/mcfly

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-if (which mcfly &>/dev/null); then
+if (command -v mcfly &>/dev/null); then
-	export MCFLY_PROMPT="❯"
+  export MCFLY_PROMPT="❯ "
   export MCFLY_INTERFACE_VIEW=BOTTOM
   export MCFLY_RESULTS=50
   export MCFLY_RESULTS_SORT=LAST_RUN

rc.d/tmux

@@ -1,25 +1,21 @@
 #!/bin/bash
 
 # GNU Screen stuff
-if ( which tmux &> /dev/null )
+if (command -v tmux &>/dev/null); then
-then
+  if [ "$(pgrep -u "$UID" "tmux" | wc -l)" -gt 0 ]; then
-  if [ $(pgrep -u "$UID" "tmux" | wc -l) -gt 0 ]
+    if [[ $TERM != screen* ]]; then
-  then
-    if [[ $TERM != screen* ]]
-    then
       nb_sessions=$(tmux list-session | wc -l)
-      nb_sessions_attached=$(tmux list-session | grep "attached" | wc -l)
+      nb_sessions_attached=$(tmux list-session | grep -c "attached")
-      nb_sessions_detached=$(tmux list-session | grep -v "attached" | wc -l)
+      nb_sessions_detached=$(tmux list-session | grep -c -v "attached")
 
-      echo_reverse "Found ${nb_sessions} tmux session(s)"
+      echo_info "tmux : found ${nb_sessions} session(s)"
 
-      echo " * ${nb_sessions_attached} attached"
+      echo "➤ ${nb_sessions_attached} session(s) attached"
-      tmux list-sessions | grep "attached" | sed -e 's/^/     - /'
+      tmux list-sessions | grep "attached" | sed -e 's/^/    • /'
 
-      echo " * ${nb_sessions_detached} detached"
+      echo "➤ ${nb_sessions_detached} session(s) detached"
-      tmux list-sessions | grep -v "attached" | sed -e 's/^/     - /'
+      tmux list-sessions | grep -v "attached" | sed -e 's/^/    • /'
 
     fi
   fi
 fi
-

rc.d/zoxide

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+if (command -v zoxide &>/dev/null); then
+  eval "$(zoxide init bash)"
+fi