feat: Réécriture gestion des prompts dans rc.d

bashrc

@@ -14,6 +14,9 @@ fi
 # Source custom libs
 if [ -d "$HOME"/.bash/libs ]; then for lib in "$HOME"/.bash/libs/*.bash; do source "$lib"; done; fi
 
+# Early customization
+if [ -d "$HOME"/.bash/rc.before.d ]; then for file in "$HOME"/.bash/rc.before.d/*; do source "$file"; done; fi
+
 # Source rc.d/*
 if [ -d "$HOME"/.bash/rc.d ]; then for file in "$HOME"/.bash/rc.d/*; do source "$file"; done; fi
 
@@ -30,3 +33,6 @@ 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

rc.after.d/blesh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+[[ ${BLE_VERSION-} ]] && ble-attach

rc.before.d/blesh

@@ -3,7 +3,4 @@
 # ble.sh () installed from nix
 if (command -v blesh-share &>/dev/null); then
 	source "$(blesh-share)"/ble.sh --attach=none # does not work currently
-	# ...
-	[[ ${BLE_VERSION-} ]] && ble-attach
-	# source "$(blesh-share)"/ble.sh
 fi

rc.d/direnv

@@ -1,24 +1,16 @@
 #!/bin/bash
 
-if ( which asdf &> /dev/null )
+if (asdf which direnv &>/dev/null); then
-then
+	# Hook direnv into your shell.
+	eval "$(asdf exec direnv hook bash)"
 
-  if ( asdf which direnv &> /dev/null )
+	# A shortcut for asdf managed direnv.
-  then
+	direnv() { asdf exec direnv "$@"; }
 
-    # Hook direnv into your shell.
+	return
-    eval "$(asdf exec direnv hook bash)"
 
-    # A shortcut for asdf managed direnv.
+elif (command -v direnv &>/dev/null); then
-    direnv() { asdf exec direnv "$@"; }
+	# Hook direnv into your shell.
-
+	eval "$(direnv hook bash)"
-    return
-  fi
-
-elif ( which direnv &> /dev/null )
-then
-
-  # Hook direnv into your shell.
-  eval "$(direnv hook bash)"
 
 fi

rc.d/prompt

@@ -2,42 +2,41 @@
 
 # Customize the prompt
 
-POWERLINE_LOCATION=$(command -v powerline-go || command -v powerline) &>/dev/null
+USE_PROMPT=powerline-go
-POWERLINE=$(basename "$POWERLINE_LOCATION")
 
-if [ "${POWERLINE}" = "powerline-go" ]; then
+case "$USE_PROMPT" in
 
-	echo "Using $POWERLINE"
+"starship")
+	if (command -v starship &>/dev/null); then
+		# echo "Using $USE_PROMPT prompt"
+		eval "$(starship init bash)"
+	else
+		echo "$USE_PROMPT command not found"
+	fi
+	;;
 
-	function _update_ps1() {
+"powerline-go")
-		PS1=$($POWERLINE -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 (command -v powerline-go &>/dev/null); then
-	}
+		# echo "Using $USE_PROMPT prompt"
-
+		function _update_ps1() {
-	if [ "$TERM" != "linux" ]; then _prompt_command_add "_update_ps1" ; fi
+			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)
-
+		}
-elif [ "${POWERLINE}" = "powerline" ]; then
+		if [ "$TERM" != "linux" ]; then _prompt_command_add "_update_ps1"; fi
-
+	else
-	echo "Using $POWERLINE"
+		echo "$USE_PROMPT command not found"
-
+	fi
-	# Run powerline daemon
+	;;
-	powerline-daemon -q
-	# Cache powerline location
-	# To locate this directory, run: pip show powerline-status
-	export POWERLINE_LOCATION="/home/xavier/.local/lib/python3.10//site-packages/powerline" # Set up powerline environment
-	export POWERLINE_CONFIG_COMMAND=powerline-config
-	export POWERLINE_BASH_CONTINUATION=1
-	export POWERLINE_BASH_SELECT=1# Invoke binding script
-	. "$POWERLINE_LOCATION/bindings/bash/powerline.sh"
-
-else
 
+*)
+	# Default simple prompt
 	if [ "$UID" -eq 0 ]; then
 		export PS1='\[\e[01;31m\]\u@\h\[\e[01;34m\] \w \$\[\e[0m\] '
 	else
 		export PS1='\[\e[01;32m\]\u@\h\[\e[01;34m\] \w \$\[\e[0m\] '
 	fi
+	;;
 
-fi
+esac
 
 # Limit the path to 3 levels
 PROMPT_DIRTRIM=3