bashrc

@@ -14,9 +14,6 @@ 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
 
@@ -33,6 +30,3 @@ 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

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

rc.d/blesh

@@ -3,4 +3,7 @@
 # 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,6 +1,11 @@
 #!/bin/bash
 
-if (asdf which direnv &>/dev/null); then
+if ( which asdf &> /dev/null )
+then
+
+  if ( asdf which direnv &> /dev/null )
+  then
+
     # Hook direnv into your shell.
     eval "$(asdf exec direnv hook bash)"
 
@@ -8,8 +13,11 @@ if (asdf which direnv &>/dev/null); then
     direnv() { asdf exec direnv "$@"; }
 
     return
+  fi
+
+elif ( which direnv &> /dev/null )
+then
 
-elif (command -v direnv &>/dev/null); then
   # Hook direnv into your shell.
   eval "$(direnv hook bash)"
 

rc.d/prompt

@@ -2,41 +2,42 @@
 
 # Customize the prompt
 
-USE_PROMPT=powerline-go
+POWERLINE_LOCATION=$(command -v powerline-go || command -v powerline) &>/dev/null
+POWERLINE=$(basename "$POWERLINE_LOCATION")
 
-case "$USE_PROMPT" in
+if [ "${POWERLINE}" = "powerline-go" ]; then
 
-"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
-	;;
+	echo "Using $POWERLINE"
 
-"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)
+		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 [ "$TERM" != "linux" ]; then _prompt_command_add "_update_ps1"; fi
-	else
-		echo "$USE_PROMPT command not found"
-	fi
-	;;
 
-*)
-	# Default simple prompt
+	if [ "$TERM" != "linux" ]; then _prompt_command_add "_update_ps1" ; fi
+
+elif [ "${POWERLINE}" = "powerline" ]; then
+
+	echo "Using $POWERLINE"
+
+	# 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
+
 	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
-	;;
 
-esac
+fi
 
 # Limit the path to 3 levels
 PROMPT_DIRTRIM=3