Some changes for macos

aliases.d/colors

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Colors
-alias ls='ls --color=auto'
+alias ls='ls -G'
 alias grep='grep --color=auto'
 alias fgrep='fgrep --color=auto'
 alias egrep='egrep --color=auto'

bash_profile

@@ -39,9 +39,12 @@ if [ -z "${BASH_CONFIG_DIR}" ]; then
   BASH_CONFIG_DIR=$(get_script_dir)
 fi
 
-if [ -f "${BASH_CONFIG_DIR}"/profile ]; then source "${BASH_CONFIG_DIR}"/profile; fi
+# Source some helpers functions
-if [ -d "${BASH_CONFIG_DIR}"/profile ]; then for file in "${BASH_CONFIG_DIR}"/profile/*; do source "$file"; done; fi
+source "${BASH_CONFIG_DIR}/_helpers.bash"
-if [ -d "${BASH_CONFIG_DIR}"/profile.d ]; then for file in "${BASH_CONFIG_DIR}"/profile.d/*; do source "$file"; done; fi
+
+_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

@@ -79,8 +79,7 @@ _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
-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 "${BASH_CONFIG_DIR}"/completion

completion.d/ssh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+#SSH
+#if [ -e ~/.ssh/config ]; then
+#	complete -W "$(cat ~/.ssh/config | egrep  -i "^\s*host\s+[a-zA-Z]" | sed -e "s/^host\s*//i")" ssh
+#fi
+#
+#if [ -e ~/.ssh/known_hosts ]; then
+#	complete -W "$(cat ~/.ssh/known_hosts | cut -f 1 -d ' ' | sed -e s/,.*//g | uniq | grep -v "\[")" ssh
+#fi

libs.deprecated/virtualization.bash

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+which virsh || return &> /dev/null
+
 hypervisor_connect() {
 
   if [ -e "${1}" ]; then echo "Usage : $0 hypervisor_name_or_ip"; return 1; fi

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,15 +2,24 @@
 
 if (command -v fzf &>/dev/null); then
 
+  # Shell integration
   source <(fzf --bash)
 
+  # 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
   FZF_ALT_C_OPTS="$(
     cat <<'EOF'
-      --height 60%
+      --prompt '󰥨  '
-      --border sharp
-      --layout reverse
-      --prompt '󰥨 '
       --pointer ❯
       --marker ✔
 EOF
@@ -20,10 +29,7 @@ EOF
   # Selection de fichiers
   FZF_CTRL_T_OPTS="$(
     cat <<'EOF'
-      --height 60%
+      --prompt '󰈞  '
-      --border sharp
-      --layout reverse
-      --prompt '󰈞 '
       --pointer ❯
       --marker ✔
       --preview="bat --color=always --style=-header {}"
@@ -34,14 +40,32 @@ EOF
   # Navigation dans l'historique
   FZF_CTRL_R_OPTS="$(
     cat <<'EOF'
-      --height 60%
+      --prompt '  '
-      --border sharp
-      --layout reverse
-      --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

@@ -7,49 +7,54 @@
 MY_PROMPTS="starship powerline-go"
 
 for prompt in $MY_PROMPTS; do
-	if (command -v "$prompt" &>/dev/null); then
+  if (command -v "$prompt" &>/dev/null); then
-		USE_PROMPT="$prompt"
+    USE_PROMPT="$prompt"
-		break
+    break
-	fi
+  fi
 done
 
 case "${USE_PROMPT}" in
 
 # https://starship.rs/
 "starship")
-	if (command -v starship &>/dev/null); then
+  if (command -v starship &>/dev/null); then
-		eval "$(starship init bash)"
+    eval "$(starship init bash)"
-	else
+  else
-		echo "${USE_PROMPT} command not found"
+    echo "${USE_PROMPT} command not found"
-	fi
+  fi
-	;;
+  ;;
 
 # https://github.com/justjanne/powerline-go
+#  -modules string
+#    	 The list of modules to load, separated by ','
+#    	 (valid choices: aws, cwd, docker, dotenv, duration, exit, git, gitlite, hg, host, jobs, kube, load, newline, nix-shell, node, perlbrew, perms, root, shell-var, ssh, svn, termtitle, terraform-workspace, time, user, venv, vgo)
+#    	 (default "nix-shell,venv,user,host,ssh,cwd,perms,git,hg,jobs,exit,root,vgo")
+#  -modules-right string
+#    	 The list of modules to load anchored to the right, for shells that support it, separated by ','
+#    	 (valid choices: aws, cwd, docker, dotenv, duration, exit, git, gitlite, hg, host, jobs, kube, load
 "powerline-go")
-	if (command -v powerline-go &>/dev/null); then
+  if (command -v powerline-go &>/dev/null); then
-		function _update_ps1() {
+    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-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
+    if [ "$TERM" != "linux" ]; then _prompt_command_add "_update_ps1"; fi
-	else
+  else
-		echo "${USE_PROMPT} command not found"
+    echo "${USE_PROMPT} command not found"
-	fi
+  fi
-	;;
+  ;;
 
 *)
-	# Default simple prompt
+  # Default simple prompt
-	if [ "$UID" -eq 0 ]; then
+  │ PROMPT_DIRTRIM=3 # Limit the path to 3 levels
-		export PS1='\[\e[01;31m\]\u@\h\[\e[01;34m\] \w \$\[\e[0m\] '
+  if [ "$UID" -eq 0 ]; then
-	else
+    export PS1='\[\e[01;31m\]\u@\h\[\e[01;34m\] \w \$\[\e[0m\] '
-		export PS1='\[\e[01;32m\]\u@\h\[\e[01;34m\] \w \$\[\e[0m\] '
+  else
-	fi
+    export PS1='\[\e[01;32m\]\u@\h\[\e[01;34m\] \w \$\[\e[0m\] '
-	;;
+  fi
+  ;;
 
 esac
 
-# Limit the path to 3 levels
-PROMPT_DIRTRIM=3
-
 # Add a smiley at end of prompt showing last command status code
 #smiley() {
 #    ret_val=$?