Compare commits

..

11 Commits

Author SHA1 Message Date
Xavier Logerais
2aaf279c9e feat(libs): Prise en compte de tmux dans la fonction term_change_title 2025-03-27 11:35:46 +00:00
Xavier Logerais
5b0012ffc1 feat(rc): Ajout du support de fzf 2025-03-21 09:37:27 +00:00
Xavier Logerais
af4fb0e5fa feat(rc): Ajout de l'outil zoxide 2025-03-15 22:37:34 +00:00
8fc95d8e90 feat(completion): Ajout de la completion pour l'outil chezmoi 2025-03-13 00:20:24 +01:00
a5dd0be77c feat(aliases): Ajout d'un alias pour lsd
Ajout de l'alias lt pour `lsd --tree` qui est un équivalent de la
commande `tree`.
2025-03-13 00:20:24 +01:00
981430eef1 feat(completion): Amélioration de la complétion pour mise 2025-03-13 00:20:24 +01:00
c7be86ecb6 fix: fix submodule directory 2025-03-13 00:20:24 +01:00
Xavier Logerais
611bab8f2f feat: Add 3rd party libs 2025-03-13 00:20:24 +01:00
Xavier Logerais
333a7d8b46 feat: Ajout des répertoires rc.before.d et rc.after.d 2025-03-13 00:20:24 +01:00
Xavier Logerais
c53e964ce9 feat: Améliore la gestion pour sourcer le contenu des sous-répertoires (*.d) 2025-03-13 00:20:24 +01:00
5cb8b5dfaf feat(rc): Amélioration de la gestion de tmux 2025-03-13 00:19:53 +01:00
10 changed files with 65 additions and 31 deletions

6
.gitmodules vendored Normal file
View File

@@ -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

1
3rd-party/complete-alias vendored Submodule

View File

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

14
bashrc
View File

@@ -25,7 +25,6 @@ source "${BASEDIR}/_helpers.bash"
# Source custom libs
_source_dir_files "${BASEDIR}"/libs
# if [ -d "$HOME"/.bash/libs ]; then for lib in "$HOME"/.bash/libs/*.bash; do source "$lib"; done; fi
# Source 3rd party libs if they exists
_source_file_if_exists "${BASEDIR}/3rd-party/complete-alias/complete_alias"
@@ -33,22 +32,16 @@ _source_file_if_exists "${BASEDIR}/3rd-party/complete-alias/complete_alias"
# Early customization
_source_dir_files "${BASEDIR}"/rc.before.d
# if [ -d "$HOME"/.bash/rc.before.d ]; then for file in "$HOME"/.bash/rc.before.d/*; do source "$file"; done; fi
# Source rc.d/*
_source_dir_files "${BASEDIR}"/rc
_source_dir_files "${BASEDIR}"/rc.d
# if [ -d "$HOME"/.bash/rc.d ]; then for file in "$HOME"/.bash/rc.d/*; do source "$file"; done; fi
# Source alias definitions
_source_file_if_exists ~/.bash_aliases
_source_file_if_exists "${BASEDIR}"/aliases
# if [ -f "$HOME"/.bash_aliases ]; then source "$HOME"/.bash_aliases; fi
# if [ -f "$HOME"/.bash/aliases ]; then source "$HOME"/.bash/aliases; fi
_source_dir_files "${BASEDIR}"/aliases
_source_dir_files "${BASEDIR}"/aliases.d
# if [ -d "$HOME"/.bash/aliases ]; then for file in "$HOME"/.bash/aliases/*; do source "$file"; done; fi
# if [ -d "$HOME"/.bash/aliases.d ]; then for file in "$HOME"/.bash/aliases.d/*; do source "$file"; done; fi
# Source bash completion definitions
# TODO: Améliorer cette partie pour éviter les erreurs quand aucun fichier n'existe
@@ -56,12 +49,8 @@ for file in /etc/bash*completion /etc/profile.d/bash*completion*; do source "$fi
_source_file_if_exists ~/.bash_completion
_source_file_if_exists "${BASEDIR}"/completion
# if [ -f "$HOME"/.bash_completion ]; then source "$HOME"/.bash_completion; fi
# if [ -f "$HOME"/.bash/completion ]; then source "$HOME"/.bash/completion; fi
_source_dir_files "${BASEDIR}"/completion
_source_dir_files "${BASEDIR}"/completion.d
# 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
_source_dir_files ~/.nix-profile/share/bash-completion/completions
if (command -v _complete_alias &>/dev/null); then
@@ -70,6 +59,3 @@ fi
# Late customization
_source_dir_files "${BASEDIR}"/rc.after.d
# if [ -d "$HOME"/.bash/rc.after.d ]; then for file in "$HOME"/.bash/rc.after.d/*; do source "$file"; done; fi
complete -C /home/ZOE/u86pw03/.local/share/mise/installs/vault/1.18.2/bin/vault vault

5
completion.d/chezmoi Normal file
View File

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

View File

@@ -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

View File

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

31
rc.d/fzf Normal file
View File

@@ -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

View File

@@ -8,13 +8,13 @@ if (command -v tmux &>/dev/null); then
nb_sessions_attached=$(tmux list-session | grep -c "attached")
nb_sessions_detached=$(tmux list-session | grep -c -v "attached")
echo_info "Found ${nb_sessions} tmux session(s)"
echo_info "tmux : found ${nb_sessions} session(s)"
echo " * ${nb_sessions_attached} attached"
tmux list-sessions | grep "attached" | sed -e 's/^/ - /'
echo " ${nb_sessions_attached} session(s) attached"
tmux list-sessions | grep "attached" | sed -e 's/^/ /'
echo " * ${nb_sessions_detached} detached"
tmux list-sessions | grep -v "attached" | sed -e 's/^/ - /'
echo " ${nb_sessions_detached} session(s) detached"
tmux list-sessions | grep -v "attached" | sed -e 's/^/ /'
fi
fi

5
rc.d/zoxide Normal file
View File

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