Compare commits
36
Commits
2585fb1b79
...
dev
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4f004fee15 | ||
|
|
2d8b9a5309 | ||
|
|
ee5e92e0a4 | ||
|
|
32c0b021c5 | ||
|
|
f2c78152cc | ||
|
|
7e007b5b0d | ||
|
|
76ce8a4758 | ||
|
|
e8eba3619a | ||
|
|
d6290589cf | ||
|
|
e40045aa99 | ||
|
|
6f7aec9147 | ||
|
|
c4a93c7647 | ||
|
|
8d98936961 | ||
|
|
5f8997f418 | ||
|
|
693d20f2cf | ||
|
|
db981696b6 | ||
|
|
594a212ebc | ||
|
|
8fef2338eb | ||
|
|
ea9139f77f | ||
|
|
15a56af2c8 | ||
|
|
a56929aa8b | ||
|
|
526e6cae26 | ||
|
|
1a003a9d72 | ||
|
|
2b51dfd554 | ||
|
|
d078a852df | ||
|
|
2aaf279c9e | ||
|
|
5b0012ffc1 | ||
|
|
af4fb0e5fa | ||
|
|
8fc95d8e90 | ||
|
|
a5dd0be77c | ||
|
|
981430eef1 | ||
|
|
c7be86ecb6 | ||
|
|
611bab8f2f | ||
|
|
333a7d8b46 | ||
|
|
c53e964ce9 | ||
|
|
5cb8b5dfaf |
@@ -0,0 +1,9 @@
|
|||||||
|
[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
|
||||||
|
[submodule "3rd-party/junegunn/fzf-git.sh"]
|
||||||
|
path = 3rd-party/junegunn/fzf-git.sh
|
||||||
|
url = https://github.com/junegunn/fzf-git.sh
|
||||||
+1
Submodule 3rd-party/complete-alias added at 7f2555c2fe
+1
Submodule 3rd-party/junegunn/fzf-git.sh added at c823ffd521
@@ -0,0 +1,44 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
function basedir() {
|
||||||
|
(cd "$(dirname \"$-2\")" && pwd)
|
||||||
|
}
|
||||||
|
|
||||||
|
function _source_file_if_exists() {
|
||||||
|
if [ -r "$1" ]; then
|
||||||
|
test -n "$DEBUG_BASHRC" && echo "-- Sourcing file $1"
|
||||||
|
source "$1"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
function _source_dir_files() {
|
||||||
|
if [ -d "$1" ]; then
|
||||||
|
test -n "$DEBUG_BASHRC" && echo "-- Sourcing files in directory $1"
|
||||||
|
|
||||||
|
# Safe loops for empty dirs
|
||||||
|
shopt -s nullglob
|
||||||
|
|
||||||
|
for file in "$1"/*; do
|
||||||
|
if [ -e "$file" ]; then
|
||||||
|
test -n "$DEBUG_BASHRC" && echo " * sourcing file $file"
|
||||||
|
source "$file"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
# Restore option nullglob to normal
|
||||||
|
shopt -u nullglob
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# Source : https://superuser.com/questions/39751/add-directory-to-path-if-its-not-already-there
|
||||||
|
_path_add() {
|
||||||
|
if [ -d "$1" ] && [[ ":$PATH:" != *":$1:"* ]]; then
|
||||||
|
PATH="${PATH:+"$PATH:"}$1"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
_prompt_command_add() {
|
||||||
|
if [ -n "$1" ] && [[ ":$PROMPT_COMMAND:" != *":$1:"* ]]; then
|
||||||
|
PROMPT_COMMAND="${PROMPT_COMMAND:+"$PROMPT_COMMAND;"}$1"
|
||||||
|
fi
|
||||||
|
}
|
||||||
+4
-2
@@ -1,5 +1,7 @@
|
|||||||
alias cdrepo='cd ~/Repositories/'
|
alias cdrepo='cd ~/Repositories/'
|
||||||
alias cdgitlab='cd ~/Repositories/Gitlab'
|
|
||||||
alias cdgithub='cd ~/Repositories/Github'
|
alias cdgithub='cd ~/Repositories/Github'
|
||||||
alias cdgl=cdgitlab
|
alias cdgitlab='cd ~/Repositories/Gitlab'
|
||||||
|
alias cdgitea='cd ~/Repositories/Gitea'
|
||||||
alias cdgh=cdgithub
|
alias cdgh=cdgithub
|
||||||
|
alias cdgl=cdgitlab
|
||||||
|
alias cdgt=cdgitea
|
||||||
|
|||||||
@@ -0,0 +1,7 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# [ "$TERM" = "xterm-kitty" ] && alias ssh="kitty +kitten ssh"
|
||||||
|
if [ -n "${KITTY_INSTALLATION_DIR}" ]; then
|
||||||
|
alias ssh="kitty +kitten ssh"
|
||||||
|
alias icat="kitty +kitten icat"
|
||||||
|
fi
|
||||||
+2
-1
@@ -2,5 +2,6 @@
|
|||||||
|
|
||||||
if (command -v lsd &> /dev/null)
|
if (command -v lsd &> /dev/null)
|
||||||
then
|
then
|
||||||
alias ls=lsd
|
alias ls='lsd'
|
||||||
|
alias lt='lsd --tree'
|
||||||
fi
|
fi
|
||||||
|
|||||||
+43
-5
@@ -1,12 +1,50 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
if [ -f "$HOME"/.nix-profile/etc/profile.d/hm-session-vars.sh ]; then
|
if [ -f "${HOME}"/.nix-profile/etc/profile.d/hm-session-vars.sh ]; then
|
||||||
source "$HOME"/.nix-profile/etc/profile.d/hm-session-vars.sh
|
source "${HOME}"/.nix-profile/etc/profile.d/hm-session-vars.sh
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -f "$HOME"/.bash/profile ]; then source "$HOME"/.bash/profile; fi
|
# Define the path to the directory of this file if not already set
|
||||||
if [ -d "$HOME"/.bash/profile ]; then for file in "$HOME"/.bash/profile/*; do source "$file"; done; fi
|
if [ -z "${BASH_CONFIG_DIR}" ]; then
|
||||||
if [ -d "$HOME"/.bash/profile.d ]; then for file in "$HOME"/.bash/profile.d/*; do source "$file"; done; fi
|
# Define a function to get the real path of a script
|
||||||
|
# (works for most cases : either sourced script or executed script, posix shells)
|
||||||
|
get_script_dir() {
|
||||||
|
local target
|
||||||
|
# Si appelé depuis un script (Bash), on regarde qui a appelé la fonction (${BASH_SOURCE[1]})
|
||||||
|
# Si la fonction est exécutée directement dans le terminal, on se rabat sur ${BASH_SOURCE[0]} ou ${0}
|
||||||
|
if [ -n "${BASH_SOURCE}" ]; then
|
||||||
|
if [ "${#BASH_SOURCE[@]}" -gt 1 ]; then
|
||||||
|
target="${BASH_SOURCE[1]}"
|
||||||
|
else
|
||||||
|
target="${BASH_SOURCE[0]}"
|
||||||
|
fi
|
||||||
|
elif [ -n "${ZSH_VERSION}" ]; then
|
||||||
|
target="${(%):-%x}"
|
||||||
|
else
|
||||||
|
target="${0}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Résolution des liens symboliques POSIX
|
||||||
|
while [ -L "${target}" ]; do
|
||||||
|
local link
|
||||||
|
link=$(readlink "${target}")
|
||||||
|
case "${link}" in
|
||||||
|
/*) target="${link}" ;;
|
||||||
|
*) target="$(dirname "${target}")/${link}" ;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
|
(cd "$(dirname "${target}")" && pwd -P)
|
||||||
|
}
|
||||||
|
BASH_CONFIG_DIR=$(get_script_dir)
|
||||||
|
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
|
# This file is sourced by bash for login shells. The following line
|
||||||
# runs your .bashrc and is recommended by the bash info pages.
|
# runs your .bashrc and is recommended by the bash info pages.
|
||||||
|
|||||||
@@ -11,37 +11,86 @@ if [[ $- != *i* ]]; then
|
|||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Safe loops for empty dirs
|
# DEBUG_BASHRC=true
|
||||||
shopt -s nullglob
|
|
||||||
|
|
||||||
|
# Define the path to the directory of this file if not already set
|
||||||
|
if [ -z "${BASH_CONFIG_DIR}" ]; then
|
||||||
|
# Define a function to get the real path of a script
|
||||||
|
# (works for most cases : either sourced script or executed script, posix shells)
|
||||||
|
get_script_dir() {
|
||||||
|
local target
|
||||||
|
# Si appelé depuis un script (Bash), on regarde qui a appelé la fonction (${BASH_SOURCE[1]})
|
||||||
|
# Si la fonction est exécutée directement dans le terminal, on se rabat sur ${BASH_SOURCE[0]} ou ${0}
|
||||||
|
if [ -n "${BASH_SOURCE}" ]; then
|
||||||
|
if [ "${#BASH_SOURCE[@]}" -gt 1 ]; then
|
||||||
|
target="${BASH_SOURCE[1]}"
|
||||||
|
else
|
||||||
|
target="${BASH_SOURCE[0]}"
|
||||||
|
fi
|
||||||
|
elif [ -n "${ZSH_VERSION}" ]; then
|
||||||
|
target="${(%):-%x}"
|
||||||
|
else
|
||||||
|
target="${0}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Résolution des liens symboliques POSIX
|
||||||
|
while [ -L "${target}" ]; do
|
||||||
|
local link
|
||||||
|
link=$(readlink "${target}")
|
||||||
|
case "${link}" in
|
||||||
|
/*) target="${link}" ;;
|
||||||
|
*) target="$(dirname "${target}")/${link}" ;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
|
(cd "$(dirname "${target}")" && pwd -P)
|
||||||
|
}
|
||||||
|
BASH_CONFIG_DIR=$(get_script_dir)
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Source some helpers functions
|
||||||
|
source "${BASH_CONFIG_DIR}/_helpers.bash"
|
||||||
|
|
||||||
# Source custom libs
|
# Source custom libs
|
||||||
if [ -d "$HOME"/.bash/libs ]; then for lib in "$HOME"/.bash/libs/*.bash; do source "$lib"; done; fi
|
_source_dir_files "${BASH_CONFIG_DIR}"/libs
|
||||||
|
|
||||||
|
# Source 3rd party libs if they exists
|
||||||
|
_source_file_if_exists "${BASH_CONFIG_DIR}/3rd-party/complete-alias/complete_alias"
|
||||||
|
_source_file_if_exists "${BASH_CONFIG_DIR}/3rd-party/junegunn/fzf-git.sh/fzf-git.sh"
|
||||||
|
|
||||||
# Early customization
|
# Early customization
|
||||||
if [ -d "$HOME"/.bash/rc.before.d ]; then for file in "$HOME"/.bash/rc.before.d/*; do source "$file"; done; fi
|
_source_dir_files "${BASH_CONFIG_DIR}"/rc.before.d
|
||||||
|
|
||||||
# Source rc.d/*
|
# Source rc.d/*
|
||||||
if [ -d "$HOME"/.bash/rc.d ]; then for file in "$HOME"/.bash/rc.d/*; do source "$file"; done; fi
|
_source_dir_files "${BASH_CONFIG_DIR}"/rc
|
||||||
|
_source_dir_files "${BASH_CONFIG_DIR}"/rc.d
|
||||||
|
|
||||||
|
# Source functions definitions
|
||||||
|
_source_file_if_exists ~/.bash_functions
|
||||||
|
_source_file_if_exists "${BASH_CONFIG_DIR}"/functions
|
||||||
|
_source_dir_files "${BASH_CONFIG_DIR}"/functions
|
||||||
|
_source_dir_files "${BASH_CONFIG_DIR}"/functions.d
|
||||||
|
|
||||||
# Source alias definitions
|
# Source alias definitions
|
||||||
if [ -f "$HOME"/.bash_aliases ]; then source "$HOME"/.bash_aliases; fi
|
_source_file_if_exists ~/.bash_aliases
|
||||||
if [ -f "$HOME"/.bash/aliases ]; then source "$HOME"/.bash/aliases; fi
|
_source_file_if_exists "${BASH_CONFIG_DIR}"/aliases
|
||||||
if [ -d "$HOME"/.bash/aliases ]; then for file in "$HOME"/.bash/aliases/*; do source "$file"; done; fi
|
_source_dir_files "${BASH_CONFIG_DIR}"/aliases
|
||||||
if [ -d "$HOME"/.bash/aliases.d ]; then for file in "$HOME"/.bash/aliases.d/*; do source "$file"; done; fi
|
_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
|
||||||
|
|
||||||
|
_source_file_if_exists ~/.bash_completion
|
||||||
|
_source_file_if_exists "${BASH_CONFIG_DIR}"/completion
|
||||||
|
_source_dir_files "${BASH_CONFIG_DIR}"/completion
|
||||||
|
_source_dir_files "${BASH_CONFIG_DIR}"/completion.d
|
||||||
|
_source_dir_files ~/.nix-profile/share/bash-completion/completions
|
||||||
|
|
||||||
if (command -v _complete_alias &>/dev/null); then
|
if (command -v _complete_alias &>/dev/null); then
|
||||||
for alias in $(alias -p | awk '{print $2}' | awk -F= '{print $1}'); do complete -o default -F _complete_alias "$alias"; done
|
for alias in $(alias -p | awk '{print $2}' | awk -F= '{print $1}'); do complete -o default -F _complete_alias "$alias"; done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Source bash completion definitions
|
|
||||||
for file in /etc/bash*completion /etc/profile.d/bash*completion*; do source "$file"; done
|
|
||||||
|
|
||||||
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
|
# Late customization
|
||||||
if [ -d "$HOME"/.bash/rc.after.d ]; then for file in "$HOME"/.bash/rc.after.d/*; do source "$file"; done; fi
|
_source_dir_files "${BASH_CONFIG_DIR}"/rc.after.d
|
||||||
|
|
||||||
# Restore option nullglob to normal
|
|
||||||
shopt -u nullglob
|
|
||||||
|
|||||||
@@ -0,0 +1,5 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
if (command -v chezmoi &>/dev/null); then
|
||||||
|
source <(chezmoi completion bash)
|
||||||
|
fi
|
||||||
@@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
if (command -v flux &>/dev/null); then
|
if (command -v flux &>/dev/null); then
|
||||||
|
|||||||
+1
-1
@@ -1,5 +1,5 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
if (command -v mise &>/dev/null); then
|
if (command -v mise &>/dev/null); then
|
||||||
source <(mise completion bash)
|
source <(mise completion bash --include-bash-completion-lib)
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -0,0 +1,5 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
if (command -v tea &>/dev/null); then
|
||||||
|
source <(tea completion bash)
|
||||||
|
fi
|
||||||
+38
-6
@@ -1,11 +1,43 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
cd $HOME || exit 1
|
# Define the path to the directory of this file if not already set
|
||||||
|
if [ -z "${BASH_CONFIG_DIR}" ]; then
|
||||||
|
# Define a function to get the real path of a script
|
||||||
|
# (works for most cases : either sourced script or executed script, posix shells)
|
||||||
|
get_script_dir() {
|
||||||
|
local target
|
||||||
|
# Si appelé depuis un script (Bash), on regarde qui a appelé la fonction (${BASH_SOURCE[1]})
|
||||||
|
# Si la fonction est exécutée directement dans le terminal, on se rabat sur ${BASH_SOURCE[0]} ou ${0}
|
||||||
|
if [ -n "${BASH_SOURCE}" ]; then
|
||||||
|
if [ "${#BASH_SOURCE[@]}" -gt 1 ]; then
|
||||||
|
target="${BASH_SOURCE[1]}"
|
||||||
|
else
|
||||||
|
target="${BASH_SOURCE[0]}"
|
||||||
|
fi
|
||||||
|
elif [ -n "${ZSH_VERSION}" ]; then
|
||||||
|
target="${(%):-%x}"
|
||||||
|
else
|
||||||
|
target="${0}"
|
||||||
|
fi
|
||||||
|
|
||||||
CONFDIR=.bash
|
# Résolution des liens symboliques POSIX
|
||||||
|
while [ -L "${target}" ]; do
|
||||||
|
local link
|
||||||
|
link=$(readlink "${target}")
|
||||||
|
case "${link}" in
|
||||||
|
/*) target="${link}" ;;
|
||||||
|
*) target="$(dirname "${target}")/${link}" ;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
ln -sf $CONFDIR/bash_profile .bash_profile
|
(cd "$(dirname "${target}")" && pwd -P)
|
||||||
ln -sf $CONFDIR/bashrc .bashrc
|
}
|
||||||
ln -sf $CONFDIR/bash_logout .bash_logout
|
BASH_CONFIG_DIR=$(get_script_dir)
|
||||||
|
fi
|
||||||
|
|
||||||
ln -sf $CONFDIR/inputrc .inputrc
|
cd "${HOME}" || exit 1
|
||||||
|
|
||||||
|
ln -sf "${BASH_CONFIG_DIR}"/bash_profile .bash_profile
|
||||||
|
ln -sf "${BASH_CONFIG_DIR}"/bashrc .bashrc
|
||||||
|
ln -sf "${BASH_CONFIG_DIR}"/bash_logout .bash_logout
|
||||||
|
ln -sf "${BASH_CONFIG_DIR}"/inputrc .inputrc
|
||||||
|
|||||||
@@ -0,0 +1,18 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
function devenv() {
|
||||||
|
|
||||||
|
local status
|
||||||
|
|
||||||
|
# Get LXC container status
|
||||||
|
status=$(lxc info devenv | yq .Status)
|
||||||
|
|
||||||
|
# Start container if not running
|
||||||
|
if [ "${status}" != "RUNNING" ]; then lxc start devenv; fi
|
||||||
|
|
||||||
|
# Rename tmux window if inside tmux
|
||||||
|
if [ -n "$TMUX" ]; then tmux rename-window "devenv"; fi
|
||||||
|
|
||||||
|
# Login as user xavier
|
||||||
|
lxc exec devenv -- login -f xavier
|
||||||
|
}
|
||||||
@@ -1,65 +0,0 @@
|
|||||||
# Include system config file
|
|
||||||
$include /etc/inputrc
|
|
||||||
|
|
||||||
# do not bell on tab-completion
|
|
||||||
set bell-style none
|
|
||||||
|
|
||||||
# Disable display of ^C
|
|
||||||
set echo-control-characters off
|
|
||||||
|
|
||||||
# Completion options
|
|
||||||
set show-all-if-ambiguous on
|
|
||||||
set show-all-if-unmodified on
|
|
||||||
|
|
||||||
# History
|
|
||||||
"\e[A": history-search-backward
|
|
||||||
"\e[B": history-search-forward
|
|
||||||
|
|
||||||
# backword/forward during search history
|
|
||||||
"\eq":backward-search-history
|
|
||||||
"\es":forward-search-history
|
|
||||||
|
|
||||||
# Alt+w Alt+x for beginning/end of line
|
|
||||||
"\ew":"\C-a"
|
|
||||||
"\ex":"\C-e"
|
|
||||||
|
|
||||||
# prepend "tail -f " with Ctrl+Alt+f
|
|
||||||
"\e\C-f":"\C-atail -f "
|
|
||||||
"\ef":"\C-atail -f "
|
|
||||||
|
|
||||||
# prepend "sudo " with Ctrl+Alt+s
|
|
||||||
"\e\C-s":"\C-asudo "
|
|
||||||
"\es":"\C-asudo "
|
|
||||||
|
|
||||||
# prepend "yes | " with Ctrl+Alt+y
|
|
||||||
"\e\C-y":"\C-ayes | "
|
|
||||||
"\ey":"\C-ayes | "
|
|
||||||
|
|
||||||
# append " | grep" with Ctrl+Alt+g
|
|
||||||
"\e\C-g":"\C-e | grep "
|
|
||||||
"\eg":"\C-e | grep "
|
|
||||||
|
|
||||||
# append " | head" with Ctrl+Alt+h
|
|
||||||
"\e\C-h":"\C-e | head"
|
|
||||||
"\eh":"\C-e | head"
|
|
||||||
|
|
||||||
# append " | tail" with Ctrl+Alt+t
|
|
||||||
"\e\C-t":"\C-e | tail"
|
|
||||||
"\et":"\C-e | tail"
|
|
||||||
|
|
||||||
# append " | more" with Ctrl+Alt+m
|
|
||||||
"\e\C-m":"\C-e | more"
|
|
||||||
"\em":"\C-e | more"
|
|
||||||
|
|
||||||
# append " | less" with Ctrl+Alt+l
|
|
||||||
"\e\C-l":"\C-e | less"
|
|
||||||
"\el":"\C-e | less"
|
|
||||||
# we can add \C-m add the end to validate command too
|
|
||||||
#"\e\C-m":"\C-e | less\C-m"
|
|
||||||
|
|
||||||
# prepend "man " with F1 and validate
|
|
||||||
"\e[11~":"\C-aman \C-m"
|
|
||||||
|
|
||||||
# Launch commands with <F2> then letter
|
|
||||||
"\e[12~i":"\C-k\C-uirssi\C-m"
|
|
||||||
"\e[12~m":"\C-k\C-umutt\C-m"
|
|
||||||
+18
-5
@@ -58,11 +58,23 @@ function echo_reverse { echo -e "\e[7m${*}\e[0m"; }
|
|||||||
function echo_concealed { echo -e "\e[8m${*}\e[0m"; }
|
function echo_concealed { echo -e "\e[8m${*}\e[0m"; }
|
||||||
|
|
||||||
# Affiche un message informatif stylisé sur la sortie d'erreur
|
# Affiche un message informatif stylisé sur la sortie d'erreur
|
||||||
function echo_info { >&2 echo -e "\e[00;34;49m ${*}\e[39;49;00m"; }
|
function echo_info { >&2 echo -e "\e[00;34;49m ${*}\e[39;49;00m"; }
|
||||||
function echo_warning { >&2 echo -e "\e[00;33;49m ${*}\e[39;49;00m"; }
|
function echo_warning { >&2 echo -e "\e[00;33;49m ${*}\e[39;49;00m"; }
|
||||||
function echo_error { >&2 echo -e "\e[00;01;31;49m ${*}\e[39;49;00m"; }
|
function echo_error { >&2 echo -e "\e[00;01;31;49m ${*}\e[39;49;00m"; }
|
||||||
function echo_success { >&2 echo -e "\e[00;01;32;49m ${*}\e[39;49;00m"; }
|
function echo_success { >&2 echo -e "\e[00;01;32;49m ${*}\e[39;49;00m"; }
|
||||||
function echo_failed { >&2 echo -e "\e[00;01;31;49m✖ ${*}\e[39;49;00m"; }
|
function echo_failed { >&2 echo -e "\e[00;01;31;49m✖ ${*}\e[39;49;00m"; }
|
||||||
|
|
||||||
|
function echo_verbose {
|
||||||
|
if [ -n "${VERBOSE}" ]; then
|
||||||
|
echo_faint "${*}" >&2
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
function echo_debug {
|
||||||
|
if [ -n "${DEBUG}" ]; then
|
||||||
|
echo_faint "🐛 ${*}" >&2
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
function echo_demo {
|
function echo_demo {
|
||||||
echo_bold bold
|
echo_bold bold
|
||||||
@@ -77,4 +89,5 @@ function echo_demo {
|
|||||||
echo_error error
|
echo_error error
|
||||||
echo_success success
|
echo_success success
|
||||||
echo_failed failed
|
echo_failed failed
|
||||||
|
DEBUG=true echo_debug debug
|
||||||
}
|
}
|
||||||
|
|||||||
+9
-10
@@ -1,17 +1,16 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
function term_change_title
|
function term_change_title {
|
||||||
{
|
|
||||||
case $TERM in
|
case $TERM in
|
||||||
# Change the window title of X terminals
|
# Change the window title of X terminals
|
||||||
xterm*|rxvt*|urxvt*|Eterm)
|
xterm* | rxvt* | urxvt* | Eterm)
|
||||||
echo -ne "\033]0;${1}\007"
|
echo -ne "\033]0;${1}\007"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
# Change the window title of screen terminals
|
# Change the window title of screen terminals
|
||||||
screen*)
|
screen* | tmux*)
|
||||||
echo -ne "\033k${1}\033\\"
|
echo -ne "\033k${1}\033\\"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -1,5 +1,5 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
if (command -v keychain &>/dev/null); then
|
if (command -v keychain &>/dev/null); then
|
||||||
eval "$(keychain --eval --noask ~/.ssh/{id_ed25519,id_rsa_native})"
|
eval "$(keychain --inherit any --quiet --noask ~/.ssh/id_{rsa,ed25519})"
|
||||||
fi
|
fi
|
||||||
|
|||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
# Define prefered LANG
|
# Define prefered LANG
|
||||||
export LANG=fr_FR.utf8
|
export LANG=fr_FR.UTF-8
|
||||||
|
|||||||
@@ -0,0 +1,71 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
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'
|
||||||
|
--prompt ' '
|
||||||
|
--pointer ❯
|
||||||
|
--marker ✔
|
||||||
|
EOF
|
||||||
|
)"
|
||||||
|
export FZF_ALT_C_OPTS
|
||||||
|
|
||||||
|
# Selection de fichiers
|
||||||
|
FZF_CTRL_T_OPTS="$(
|
||||||
|
cat <<'EOF'
|
||||||
|
--prompt ' '
|
||||||
|
--pointer ❯
|
||||||
|
--marker ✔
|
||||||
|
--preview="bat --color=always --style=-header {}"
|
||||||
|
EOF
|
||||||
|
)"
|
||||||
|
export FZF_CTRL_T_OPTS
|
||||||
|
|
||||||
|
# Navigation dans l'historique
|
||||||
|
FZF_CTRL_R_OPTS="$(
|
||||||
|
cat <<'EOF'
|
||||||
|
--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
|
||||||
+15
-6
@@ -2,28 +2,37 @@
|
|||||||
|
|
||||||
# Customize the prompt
|
# Customize the prompt
|
||||||
|
|
||||||
USE_PROMPT=powerline-go
|
# Indicate your preference order for prompt tools
|
||||||
|
# The first one found available will be used
|
||||||
|
MY_PROMPTS="starship powerline-go"
|
||||||
|
|
||||||
case "$USE_PROMPT" in
|
for prompt in $MY_PROMPTS; do
|
||||||
|
if (command -v "$prompt" &>/dev/null); then
|
||||||
|
USE_PROMPT="$prompt"
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
case "${USE_PROMPT}" in
|
||||||
|
|
||||||
|
# https://starship.rs/
|
||||||
"starship")
|
"starship")
|
||||||
if (command -v starship &>/dev/null); then
|
if (command -v starship &>/dev/null); then
|
||||||
# echo "Using $USE_PROMPT prompt"
|
|
||||||
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
|
||||||
"powerline-go")
|
"powerline-go")
|
||||||
if (command -v powerline-go &>/dev/null); then
|
if (command -v powerline-go &>/dev/null); then
|
||||||
# echo "Using $USE_PROMPT prompt"
|
|
||||||
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
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,49 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Function to update terminal/tmux title
|
||||||
|
_update_terminal_title() {
|
||||||
|
local kubecontext dir gitrepo gitremote icon title
|
||||||
|
|
||||||
|
# Detect Kubernetes context (if kubectl is available)
|
||||||
|
if [ -n "${KUBECONFIG}" ]; then
|
||||||
|
if command -v kubectl >/dev/null 2>&1; then
|
||||||
|
kubecontext=$(kubectl config current-context 2>/dev/null)
|
||||||
|
if [ -n "$kubecontext" ]; then
|
||||||
|
title=" ${kubecontext}"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
# If no title is already set, check if we're in $HOME
|
||||||
|
if [ -z "${title}" ] && [ "$PWD" = "$HOME" ]; then
|
||||||
|
title=" ~"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# If we're in a git repo display repo name with a nice icon
|
||||||
|
if [ -z "${title}" ] && gitrepo=$(git rev-parse --show-toplevel 2>/dev/null); then
|
||||||
|
dir=$(basename "${gitrepo}")
|
||||||
|
|
||||||
|
# Detect host from remote URL
|
||||||
|
gitremote=$(git remote get-url origin 2>/dev/null)
|
||||||
|
case "${gitremote}" in
|
||||||
|
*github.com*) icon="" ;; # nf-fa-github
|
||||||
|
*gitlab.com*) icon="" ;; # nf-fa-gitlab
|
||||||
|
*gitea*) icon="" ;; # nf-linux-gitea
|
||||||
|
*) icon="" ;; # nf-dev-git
|
||||||
|
esac
|
||||||
|
|
||||||
|
title="${icon} ${dir}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Set the title in tmux or terminal window
|
||||||
|
if [ -n "${title}" ]; then
|
||||||
|
if [ -n "$TMUX" ]; then
|
||||||
|
tmux rename-window "${title}"
|
||||||
|
else
|
||||||
|
printf '\033]0;%s\007' "${title}"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# Add the function to the PROMPT_COMMAND variable to have regular updates
|
||||||
|
if [ "$TERM" != "linux" ]; then _prompt_command_add "_update_terminal_title"; fi
|
||||||
@@ -8,13 +8,13 @@ if (command -v tmux &>/dev/null); then
|
|||||||
nb_sessions_attached=$(tmux list-session | grep -c "attached")
|
nb_sessions_attached=$(tmux list-session | grep -c "attached")
|
||||||
nb_sessions_detached=$(tmux list-session | grep -c -v "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"
|
echo "➤ ${nb_sessions_attached} session(s) attached"
|
||||||
tmux list-sessions | grep "attached" | sed -e 's/^/ - /'
|
tmux list-sessions | grep "attached" | sed -e 's/^/ • /'
|
||||||
|
|
||||||
echo " * ${nb_sessions_detached} detached"
|
echo "➤ ${nb_sessions_detached} session(s) detached"
|
||||||
tmux list-sessions | grep -v "attached" | sed -e 's/^/ - /'
|
tmux list-sessions | grep -v "attached" | sed -e 's/^/ • /'
|
||||||
|
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|||||||
+12
@@ -0,0 +1,12 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# INFO:
|
||||||
|
# vivid is a generator for the LS_COLORS environment variable that controls the colorized output of ls, tree, fd, bfs, dust and many other tools.
|
||||||
|
# ➜ https://github.com/sharkdp/vivid
|
||||||
|
# 💡Use command `vivid themes` to see available themes
|
||||||
|
|
||||||
|
if (command -v vivid &>/dev/null); then
|
||||||
|
THEME=tokyonight-moon
|
||||||
|
LS_COLORS="$(vivid generate ${THEME})"
|
||||||
|
export LS_COLORS
|
||||||
|
fi
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
if (command -v zoxide &>/dev/null); then
|
||||||
|
eval "$(zoxide init bash)"
|
||||||
|
fi
|
||||||
Reference in New Issue
Block a user