diff --git a/bash_profile b/bash_profile index 6d280c3..39f1384 100644 --- a/bash_profile +++ b/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 -if [ -d "${BASH_CONFIG_DIR}"/profile ]; then for file in "${BASH_CONFIG_DIR}"/profile/*; do source "$file"; done; fi -if [ -d "${BASH_CONFIG_DIR}"/profile.d ]; then for file in "${BASH_CONFIG_DIR}"/profile.d/*; do source "$file"; done; 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. diff --git a/profile.d/lang b/profile.d/lang index 3b455dc..8989d67 100644 --- a/profile.d/lang +++ b/profile.d/lang @@ -1,4 +1,4 @@ #!/bin/bash # Define prefered LANG -export LANG=fr_FR.utf8 +export LANG=fr_FR.UTF-8 diff --git a/rc.d/fzf b/rc.d/fzf index 7e85d74..4d7276a 100644 --- a/rc.d/fzf +++ b/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% - --border sharp - --layout reverse - --prompt '󰥨 ' + --prompt '󰥨 ' --pointer ❯ --marker ✔ EOF @@ -20,10 +29,7 @@ EOF # Selection de fichiers FZF_CTRL_T_OPTS="$( cat <<'EOF' - --height 60% - --border sharp - --layout reverse - --prompt '󰈞 ' + --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% - --border sharp - --layout reverse - --prompt ' ' + --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