Some changes for macos

.gitmodules

@@ -1,6 +0,0 @@
-[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

_helpers.bash

@@ -1,44 +0,0 @@
-#!/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
-}

aliases.d/bat

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-if (command -v bat &>/dev/null); then
-  alias cat=bat
-fi

aliases.d/cd

@@ -1,7 +1,6 @@
-alias cdrepo='cd ~/Repositories/'
+alias cdrepo='cd ~/repositories/'
-alias cdgithub='cd ~/Repositories/Github'
+alias cddns='cd ~/repositories/dns && git pull'
-alias cdgitlab='cd ~/Repositories/Gitlab'
+alias cdfai='cd ~/repositories/fai && git pull'
-alias cdgitea='cd ~/Repositories/Gitea'
+alias cdpuppet='cd ~/repositories/puppet && git pull'
-alias cdgh=cdgithub
+alias cdhiera='cd ~/repositories/hiera && git pull'
-alias cdgl=cdgitlab
+alias cdshinken='cd ~/repositories/shinken && git pull'
-alias cdgt=cdgitea

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'

aliases.d/fun

@@ -3,7 +3,4 @@
 # Fun
 alias matrix='tr -c "[:digit:]" " " < /dev/urandom | dd cbs=$COLUMNS conv=unblock | GREP_COLOR="1;32" grep --color "[^ ]"'
 
-if (command -v beep &> /dev/null)
+alias starwars='beep -l 350 -f 392 -D 100 --new -l 350 -f 392 -D 100 --new -l 350 -f 392 -D 100 --new -l 250 -f 311.1 -D 100 --new -l 25 -f 466.2 -D 100 --new -l 350 -f 392 -D 100 --new -l 250 -f 311.1 -D 100 --new -l 25 -f 466.2 -D 100 --new -l 700 -f 392 -D 100 --new -l 350 -f 587.32 -D 100 --new -l 350 -f 587.32 -D 100 --new -l 350 -f 587.32 -D 100 --new -l 250 -f 622.26 -D 100 --new -l 25 -f 466.2 -D 100 --new -l 350 -f 369.99 -D 100 --new -l 250 -f 311.1 -D 100 --new -l 25 -f 466.2 -D 100 --new -l 700 -f 392 -D 100 --new -l 350 -f 784 -D 100 --new -l 250 -f 392 -D 100 --new -l 25 -f 392 -D 100 --new -l 350 -f 784 -D 100 --new -l 250 -f 739.98 -D 100 --new -l 25 -f 698.46 -D 100 --new -l 25 -f 659.26 -D 100 --new -l 25 -f 622.26 -D 100 --new -l 50 -f 659.26 -D 400 --new -l 25 -f 415.3 -D 200 --new -l 350 -f 554.36 -D 100 --new -l 250 -f 523.25 -D 100 --new -l 25 -f 493.88 -D 100 --new -l 25 -f 466.16 -D 100 --new -l 25 -f 440 -D 100 --new -l 50 -f 466.16 -D 400 --new -l 25 -f 311.13 -D 200 --new -l 350 -f 369.99 -D 100 --new -l 250 -f 311.13 -D 100 --new -l 25 -f 392 -D 100 --new -l 350 -f 466.16 -D 100 --new -l 250 -f 392 -D 100 --new -l 25 -f 466.16 -D 100 --new -l 700 -f 587.32 -D 100 --new -l 350 -f 784 -D 100 --new -l 250 -f 392 -D 100 --new -l 25 -f 392 -D 100 --new -l 350 -f 784 -D 100 --new -l 250 -f 739.98 -D 100 --new -l 25 -f 698.46 -D 100 --new -l 25 -f 659.26 -D 100 --new -l 25 -f 622.26 -D 100 --new -l 50 -f 659.26 -D 400 --new -l 25 -f 415.3 -D 200 --new -l 350 -f 554.36 -D 100 --new -l 250 -f 523.25 -D 100 --new -l 25 -f 493.88 -D 100 --new -l 25 -f 466.16 -D 100 --new -l 25 -f 440 -D 100 --new -l 50 -f 466.16 -D 400 --new -l 25 -f 311.13 -D 200 --new -l 350 -f 392 -D 100 --new -l 250 -f 311.13 -D 100 --new -l 25 -f 466.16 -D 100 --new -l 300 -f 392.00 -D 150 --new -l 250 -f 311.13 -D 100 --new -l 25 -f 466.16 -D 100 --new -l 700 -f 392'
-then
-	alias starwars='beep -l 350 -f 392 -D 100 --new -l 350 -f 392 -D 100 --new -l 350 -f 392 -D 100 --new -l 250 -f 311.1 -D 100 --new -l 25 -f 466.2 -D 100 --new -l 350 -f 392 -D 100 --new -l 250 -f 311.1 -D 100 --new -l 25 -f 466.2 -D 100 --new -l 700 -f 392 -D 100 --new -l 350 -f 587.32 -D 100 --new -l 350 -f 587.32 -D 100 --new -l 350 -f 587.32 -D 100 --new -l 250 -f 622.26 -D 100 --new -l 25 -f 466.2 -D 100 --new -l 350 -f 369.99 -D 100 --new -l 250 -f 311.1 -D 100 --new -l 25 -f 466.2 -D 100 --new -l 700 -f 392 -D 100 --new -l 350 -f 784 -D 100 --new -l 250 -f 392 -D 100 --new -l 25 -f 392 -D 100 --new -l 350 -f 784 -D 100 --new -l 250 -f 739.98 -D 100 --new -l 25 -f 698.46 -D 100 --new -l 25 -f 659.26 -D 100 --new -l 25 -f 622.26 -D 100 --new -l 50 -f 659.26 -D 400 --new -l 25 -f 415.3 -D 200 --new -l 350 -f 554.36 -D 100 --new -l 250 -f 523.25 -D 100 --new -l 25 -f 493.88 -D 100 --new -l 25 -f 466.16 -D 100 --new -l 25 -f 440 -D 100 --new -l 50 -f 466.16 -D 400 --new -l 25 -f 311.13 -D 200 --new -l 350 -f 369.99 -D 100 --new -l 250 -f 311.13 -D 100 --new -l 25 -f 392 -D 100 --new -l 350 -f 466.16 -D 100 --new -l 250 -f 392 -D 100 --new -l 25 -f 466.16 -D 100 --new -l 700 -f 587.32 -D 100 --new -l 350 -f 784 -D 100 --new -l 250 -f 392 -D 100 --new -l 25 -f 392 -D 100 --new -l 350 -f 784 -D 100 --new -l 250 -f 739.98 -D 100 --new -l 25 -f 698.46 -D 100 --new -l 25 -f 659.26 -D 100 --new -l 25 -f 622.26 -D 100 --new -l 50 -f 659.26 -D 400 --new -l 25 -f 415.3 -D 200 --new -l 350 -f 554.36 -D 100 --new -l 250 -f 523.25 -D 100 --new -l 25 -f 493.88 -D 100 --new -l 25 -f 466.16 -D 100 --new -l 25 -f 440 -D 100 --new -l 50 -f 466.16 -D 400 --new -l 25 -f 311.13 -D 200 --new -l 350 -f 392 -D 100 --new -l 250 -f 311.13 -D 100 --new -l 25 -f 466.16 -D 100 --new -l 300 -f 392.00 -D 150 --new -l 250 -f 311.13 -D 100 --new -l 25 -f 466.16 -D 100 --new -l 700 -f 392'
-fi

aliases.d/git

@@ -1,12 +1,12 @@
 #!/bin/bash
 
 # Git
-if [ -x /usr/bin/git ]; then
+if [ -x /usr/bin/git ]
+then
   alias gs='git status'
   alias ga='git add'
   alias gc='git commit'
   alias gca='git commit -a'
-    alias gf='git fetch'
   alias gu='git pull'
   alias gp='git pull && git push'
   alias gd='git diff'

aliases.d/gopass

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-if (command -v 'gopass' && ! command -v pass ) &> /dev/null
-then
-  alias pass='gopass'
-fi

aliases.d/kubectl

@@ -1,21 +0,0 @@
-#!/bin/bash
-
-if (command -v kubectl &>/dev/null); then
-
-	# create some usefull aliases
-	alias k="kubectl"
-	alias kg="kubectl get"
-	alias kd="kubectl describe"
-
-	alias ks="kubectl --namespace kube-system"
-	alias ksg="kubectl --namespace kube-system get"
-	alias ksd="kubectl --namespace kube-system describe"
-	alias kga="kubectl get --all-namespaces"
-	alias kuc="kubectl config unset current-context"
-	alias kun="kubectl config set-context --current --namespace="
-
-	alias kgnodes="kubectl get nodes --label-columns topology.kubernetes.io/region,topology.kubernetes.io/zone"
-	alias kgmasters="kubectl get nodes --selector 'node-role.kubernetes.io/control-plane' --label-columns topology.kubernetes.io/region,topology.kubernetes.io/zone"
-	alias kgworkers="kubectl get nodes --selector '!node-role.kubernetes.io/control-plane' --label-columns topology.kubernetes.io/region,topology.kubernetes.io/zone"
-	alias kgtaints="kubectl get nodes --output custom-columns=NAME:.metadata.name,TAINTS:.spec.taints"
-fi

aliases.d/lazygit

@@ -1,6 +0,0 @@
-#/bin/bash
-
-if (command -v lazygit &> /dev/null)
-then
-  alias lg=lazygit
-fi

aliases.d/lsd

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-if (command -v lsd &> /dev/null)
-then
-  alias ls='lsd'
-  alias lt='lsd --tree'
-fi

aliases.d/mutt

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+if (which mutt &> /dev/null); then
+  if [ "$TERM" = "rxvt-unicode" ]; then
+    alias mutt="TERM=rxvt-unicode-256color SOCKS_SERVER=10.181.176.208:1080 socksify mutt"
+  else
+    alias mutt="SOCKS_SERVER=10.181.176.208:1080 socksify mutt"
+  fi
+fi

aliases.d/nvim

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-# Vim Editor
-if [ -x ~/AppImages/nvim.appimage ]
-then
-  alias nvim='~/AppImages/nvim.appimage'
-fi

aliases.d/taskwarrior

@@ -1,7 +1,6 @@
-#
 # Aliases for taskwarrior
 #
-if (command -v task &> /dev/null)
+if (which task &> /dev/null)
 then
   alias t='task'
   alias tl='task list'
@@ -9,8 +8,3 @@ then
   alias td='task done'
   alias ts='task sync'
 fi
-
-if (command -v taskwarrior-tui &> /dev/null)
-then
-  alias tu='taskwarrior-tui'
-fi

aliases.d/vim

@@ -1,20 +1,9 @@
 #!/bin/bash
 
 # Vim Editor
-if (command -v nvim &> /dev/null)
+if [ -x /usr/bin/vim ]
 then
-  alias vim=nvim
+  alias vi='vim -p'
+  alias view='vim -R'
+  alias vless='vim -u /usr/share/vim/vim74/macros/less.vim -c "colorscheme mustangpp"'
 fi
-
-# if (command -v lvim &>/dev/null); then
-# 	alias vim=lvim
-# elif (command -v nvim &>/dev/null); then
-# 	alias vim=nvim
-# fi
-
-# if [ -x /usr/bin/vim ]
-# then
-#   alias vi='vim -p'
-#   alias view='vim -R'
-#   alias vless='vim -u /usr/share/vim/vim*/macros/less.vim'
-# fi

bash_profile

@@ -1,12 +1,8 @@
 #!/bin/bash
 
-if [ -f "$HOME"/.nix-profile/etc/profile.d/hm-session-vars.sh ]; then
+if [ -f $HOME/.bash/profile ]; then source $HOME/.bash/profile; fi
-	source "$HOME"/.nix-profile/etc/profile.d/hm-session-vars.sh
+if [ -d $HOME/.bash/profile ]; then for file in $(ls $HOME/.bash/profile/*); do source $file; done; fi
-fi
+if [ -d $HOME/.bash/profile.d ]; then for file in $(ls $HOME/.bash/profile.d/*); do source $file; done; fi
-
-if [ -f "$HOME"/.bash/profile ]; then source "$HOME"/.bash/profile; fi
-if [ -d "$HOME"/.bash/profile ]; then for file in "$HOME"/.bash/profile/*; do source "$file"; done; fi
-if [ -d "$HOME"/.bash/profile.d ]; then for file in "$HOME"/.bash/profile.d/*; do source "$file"; done; fi
 
 # This file is sourced by bash for login shells.  The following line
 # runs your .bashrc and is recommended by the bash info pages.

bashrc

@@ -6,61 +6,28 @@
 # Test for an interactive shell.  There is no need to set anything
 # past this point for scp and rcp, and it's important to refrain from
 # outputting anything in those cases.
-if [[ $- != *i* ]]; then
+if [[ $- != *i* ]] ; then
 	# Shell is non-interactive.  Be done now!
 	return
 fi
 
-# DEBUG_BASHRC=true
-
-# Determine path to directory of this file (FIX: remove dependency to readlink for posix compliance)
-BASEDIR=$(
-	source_file=$(readlink -f "${BASH_SOURCE[0]}")
-	source_dir=$(dirname "${source_file}")
-	cd "${source_dir}" && pwd
-)
-
-# Source some helpers functions
-source "${BASEDIR}/_helpers.bash"
-
 # Source custom libs
-_source_dir_files "${BASEDIR}"/libs
+if [ -d $HOME/.bash/libs ]; then for lib in $(ls $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"
-
-# Early customization
-_source_dir_files "${BASEDIR}"/rc.before.d
 
 # Source rc.d/*
-_source_dir_files "${BASEDIR}"/rc
+if [ -d $HOME/.bash/rc.d ]; then for file in $(ls $HOME/.bash/rc.d/*); do source $file; done; fi
-_source_dir_files "${BASEDIR}"/rc.d
-
-# Source functions definitions
-_source_file_if_exists ~/.bash_functions
-_source_file_if_exists "${BASEDIR}"/functions
-_source_dir_files "${BASEDIR}"/functions
-_source_dir_files "${BASEDIR}"/functions.d
 
 # Source alias definitions
-_source_file_if_exists ~/.bash_aliases
+if [ -f $HOME/.bash_aliases ]; then source $HOME/.bash_aliases; fi
-_source_file_if_exists "${BASEDIR}"/aliases
+if [ -f $HOME/.bash/aliases ]; then source $HOME/.bash/aliases; fi
-_source_dir_files "${BASEDIR}"/aliases
+if [ -d $HOME/.bash/aliases ]; then for file in $(ls $HOME/.bash/aliases/*); do source $file; done; fi
-_source_dir_files "${BASEDIR}"/aliases.d
+if [ -d $HOME/.bash/aliases.d ]; then for file in $(ls $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
+#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
+if [ -f $HOME/.bash_completion ]; then source $HOME/.bash_completion; fi
-_source_file_if_exists "${BASEDIR}"/completion
+if [ -f $HOME/.bash/completion ]; then source $HOME/.bash/completion; fi
-_source_dir_files "${BASEDIR}"/completion
+if [ -d $HOME/.bash/completion ]; then for file in $(ls $HOME/.bash/completion/*); do source $file; done; fi
-_source_dir_files "${BASEDIR}"/completion.d
+if [ -d $HOME/.bash/completion.d ]; then for file in $(ls $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
-	for alias in $(alias -p | awk '{print $2}' | awk -F= '{print $1}'); do complete -o default -F _complete_alias "$alias"; done
-fi
-
-# Late customization
-_source_dir_files "${BASEDIR}"/rc.after.d

completion.d/aws

@@ -1,5 +1,6 @@
 #!/bin/bash
 
-if (command -v aws && command -v aws_completer) &>/dev/null; then
+if ( which aws && which aws_completer ) &> /dev/null
+then
   complete -C aws_completer aws
 fi

completion.d/chezmoi

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

completion.d/flux

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

completion.d/glab

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

completion.d/helm

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

completion.d/k3d

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

completion.d/kind

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

completion.d/kubectl

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-if (command -v kubectl &> /dev/null)
+if ( which kubectl ) &> /dev/null
 then
   source <(kubectl completion bash)
 fi

completion.d/minikube

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

completion.d/mise

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

completion.d/podman

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

completion.d/poetry

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-if ( command -v poetry &> /dev/null )
-then
-  source <(poetry completions bash)
-fi

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

completion.d/stern

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

completion.d/taskwarrior

@@ -1,7 +0,0 @@
-#
-# Completion for taskwarrior
-#
-if (command -v task &> /dev/null)
-then
-  complete -o nospace -F _task t
-fi

functions.d/devenv

@@ -1,18 +0,0 @@
-#!/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
-}

libs.deprecated/path.bash

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-_path_add() {
-    if [ -d "$1" ] && [[ ":$PATH:" != *":$1:"* ]]; then
-        PATH="${PATH:+"$PATH:"}$1"
-    fi
-}
-
-# Source : https://superuser.com/questions/39751/add-directory-to-path-if-its-not-already-there

libs.deprecated/prompt_command.bash

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-_prompt_command_add() {
-    if [ -n "$1" ] && [[ ":$PROMPT_COMMAND:" != *":$1:"* ]]; then
-        PROMPT_COMMAND="${PROMPT_COMMAND:+"$PROMPT_COMMAND;"}$1"
-    fi
-}
-
-export PROMPT_COMMAND

libs/basedir.bash

@@ -1,5 +1,5 @@
 #!/bin/bash
 
 function basedir() {
-  (cd "$(dirname \"$-2\")" && pwd)
+  echo $( cd $(dirname $0) && pwd )
 }

libs/colors.bash

@@ -30,12 +30,6 @@
 #48	Subscript
 #49	Superscript
 
-#bold_on=`escape 1m`
-#bold_off=`escape 22m`
-#blink_on=`escape 5m`
-#blink_off=`escape 25m`
-#reset=`escape 0m`
-
 #T_ROWS=`tput lines`        #  Define current terminal dimension 
 #T_COLS=`tput cols`         #+ in rows and columns.
 #_UNDERLINE_ON=`tput smul`   # turn on underline
@@ -48,33 +42,53 @@
 #tput rev - Display inverse colors
 #tput sgr0 - Reset everything
 
-# Affiche un message stylisé sur la sortie standard
+default='\E[39;49;00m'
-function echo_bold { echo -e "\e[1m${*}\e[0m"; }
+bold='\E[1m'
-function echo_faint { echo -e "\e[2m${*}\e[0m"; }
+italic='\E[3m'
-function echo_italic { echo -e "\e[3m${*}\e[0m"; }
+underline='\E[4m'
-function echo_underline { echo -e "\e[4m${*}\e[0m"; }
+blink='\E[5m'
-function echo_blink { echo -e "\e[5m${*}\e[0m"; }
-function echo_reverse { echo -e "\e[7m${*}\e[0m"; }
-function echo_concealed { echo -e "\e[8m${*}\e[0m"; }
 
-# Affiche un message informatif stylisé sur la sortie d'erreur
+blackonwhite='\E[30;47m'
-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_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_failed { >&2 echo -e "\e[00;01;31;49m✖  ${*}\e[39;49;00m"; }
 
-function echo_demo {
+#reset=`escape 0m`
-  echo_bold bold
+#black='\E[30;47m'
-  echo_faint faint
+#red='\E[31;47m'
-  echo_italic italic
+#green='\E[32;47m'
-  echo_underline underline
+#yellow='\E[33;47m'
-  echo_blink blink
+#blue='\E[34;47m'
-  echo_reverse reverse
+#magenta='\E[35;47m'
-  echo_concealed concealed
+#cyan='\E[36;47m'
-  echo_info info
+#white='\E[37;47m'
-  echo_warning warning
+#bold_on=`escape 1m`
-  echo_error error
+#bold_off=`escape 22m`
-  echo_success success
+#blink_on=`escape 5m`
-  echo_failed failed
+#blink_off=`escape 25m`
+
+
+function echo_reverse
+{
+  echo -ne $blackonwhite
+  echo -ne "$*"
+  echo -e $default
+}
+
+function echo_italic
+{
+  echo -ne $italic
+  echo -ne "$*"
+  echo -e $default
+}
+
+function echo_bold
+{
+  echo -ne $bold
+  echo -ne "$*"
+  echo -e $default
+}
+
+function echo_underline
+{
+  echo -ne $underline
+  echo -ne "$*"
+  echo -e $default
 }

libs/note.bash

@@ -1,19 +1,19 @@
 #!/bin/bash
 
-note() {
+note () {
     # if file doesn't exist, create it
     if [[ ! -f $HOME/.notes ]]; then
-        touch "$HOME"/.notes
+        touch $HOME/.notes
     fi
 
     if [[ $# -eq 0 ]]; then
         # no arguments, print file
-        cat "$HOME"/.notes
+        cat $HOME/.notes
     elif [[ "$1" == "-c" ]]; then
         # clear file
-        echo "" >"$HOME"/.notes
+        echo "" > $HOME/.notes
     else
         # add all arguments to file
-        echo "$@" >>"$HOME"/.notes
+        echo "$@" >> $HOME/.notes
     fi
 }

libs/password.bash

@@ -2,8 +2,8 @@
 
 encpasswd() {
       	local password_clear=$1
-        local password_md5hash=$(openssl passwd -1 "$password_clear")
+        local password_md5hash=$(openssl passwd -1 $password_clear)
-        local password_sha1=$(echo -n "$password_clear" | openssl dgst -sha1)
+        local password_sha1=$(echo -n $password_clear | openssl dgst -sha1)
         echo "Password : $password_clear"
         echo "MD5HASH  : $password_md5hash"
         echo "SHA1  : $password_sha1"
@@ -12,12 +12,10 @@ encpasswd() {
 genpasswd() {
 	local l=$1
        	[ "$l" == "" ] && l=12
-        local password_clear=$(tr -dc A-Za-z0-9_ </dev/urandom | head -c "${l}" | xargs)
+      	local password_clear=$(tr -dc A-Za-z0-9_ < /dev/urandom | head -c ${l} | xargs)
-        local password_md5hash=$(openssl passwd -1 "$password_clear")
+        local password_md5hash=$(openssl passwd -1 $password_clear)
-        local password_sha1=$(echo -n "$password_clear" | openssl dgst -sha1)
+        local password_sha1=$(echo -n $password_clear | openssl dgst -sha1)
-        local password_base64=$(echo -n "$password_clear" | base64)
         echo "Password : $password_clear"
-        echo "Base64 : $password_base64"
         echo "MD5HASH  : $password_md5hash"
         echo "SHA1  : $password_sha1"
 }

libs/ssh.bash

@@ -1,12 +1,14 @@
 #!/bin/bash
 
-function ssh_clean_known_hosts() {
+function ssh_clean_known_hosts ()
-	if [ -z "$1" ]; then
+{
+	if [ -z "$1" ]
+	then
 		echo "No arguments given. Cleaning ~/.ssh/known_hosts"
 		sed -i -e '/no hostip for proxy command/ d' ~/.ssh/known_hosts
 	else
 		hostname=$1
-		ip=$(ssh admin dig +short "$1")
+		ip=$(ssh admin dig +short $1)
 		echo "Removing host ${hostname} from ~/.ssh/known_hosts"
 		sed -i -e "/${hostname}/ d" ~/.ssh/known_hosts
 		echo "Removing ip ${ip} from ~/.ssh/known_hosts"

libs/term.bash

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

libs/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/apps

@@ -1,30 +1,8 @@
 #!/bin/bash
 
 # Defined prefered applications
+export TERMINAL=urxvtc
+export PAGER=less
+export EDITOR=vim
+export BROWSER=surf
 
-# EDITOR
-if (command -v nvim &>/dev/null); then
-	export EDITOR=nvim
-fi
-
-# PAGER
-if (command -v less &>/dev/null); then
-	export PAGER=less
-fi
-
-# MANPAGER
-if (command -v nvim &>/dev/null); then
-	export MANPAGER='nvim +Man!'
-elif (command -v bat &>/dev/null); then
-	export MANPAGER="sh -c 'col -bx | bat -l man -p'"
-fi
-
-# TERMINAL
-if (command -v kitty &>/dev/null); then
-	export TERMINAL=kitty
-fi
-
-# BROWSER
-if (command -v firefox &>/dev/null); then
-	export BROWSER=firefox
-fi

profile.d/keychain

@@ -1,5 +1,6 @@
 #!/bin/bash
 
-if (command -v keychain &>/dev/null); then
+if $(which keychain &> /dev/null)
-  eval "$(keychain --inherit any --quiet --noask ~/.ssh/id_{rsa,ed25519})"
+then
+  eval $(keychain --agents ssh,gpg --eval)
 fi

profile.d/krew

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-if (command -v krew &>/dev/null); then
-	export PATH="${KREW_ROOT:-$HOME/.krew}/bin:$PATH"
-fi

profile.d/lang

@@ -1,4 +1,4 @@
 #!/bin/bash
 
 # Define prefered LANG
-export LANG=fr_FR.utf8
+export LANG=fr_FR.UTF-8

profile.d/xdg

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+# Defined prefered applications
+export XDG_RUNTIME_DIR=$HOME/.cache

rc.after.d/blesh

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

rc.before.d/blesh

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-# ble.sh () installed from nix
-if (command -v blesh-share &>/dev/null); then
-	source "$(blesh-share)"/ble.sh --attach=none # does not work currently
-fi

rc.d/anyenv

@@ -4,6 +4,7 @@
 
 # git clone https://github.com/riywo/anyenv $HOME/.anyenv
 
-if (which anyenv &>/dev/null); then
+if ( which anyenv &> /dev/null )
+then
   eval "$(anyenv init -)"
 fi

rc.d/asdf

@@ -1,16 +0,0 @@
-#!/bin/bash
-
-if [ -f ~/.asdf/asdf.sh ]; then
-
-	# activate asdf
-	source ~/.asdf/asdf.sh
-
-	# activate completion
-	source ~/.asdf/completions/asdf.bash
-
-fi
-
-if [ -f "$HOME/.nix-profile/share/asdf-vm/asdf.sh" ]; then
-	. "$HOME/.nix-profile/share/asdf-vm/asdf.sh"
-	. "$HOME/.nix-profile/share/bash-completion/completions/asdf.bash"
-fi

rc.d/broot

@@ -1,23 +0,0 @@
-#!/bin/bash
-
-if (command -v broot &>/dev/null); then
-    # This script was automatically generated by the broot program
-    # More information can be found in https://github.com/Canop/broot
-    # This function starts broot and executes the command
-    # it produces, if any.
-    # It's needed because some shell commands, like `cd`,
-    # have no useful effect if executed in a subshell.
-    function br {
-        local cmd cmd_file code
-        cmd_file=$(mktemp)
-        if broot --outcmd "$cmd_file" "$@"; then
-            cmd=$(<"$cmd_file")
-            rm -f "$cmd_file"
-            eval "$cmd"
-        else
-            code=$?
-            rm -f "$cmd_file"
-            return "$code"
-        fi
-    }
-fi

rc.d/direnv

@@ -1,16 +1,6 @@
 #!/bin/bash
 
-if (asdf which direnv &>/dev/null); then
+if (which -s direnv)
-	# Hook direnv into your shell.
+then
-	eval "$(asdf exec direnv hook bash)"
-
-	# A shortcut for asdf managed direnv.
-	direnv() { asdf exec direnv "$@"; }
-
-	return
-
-elif (command -v direnv &>/dev/null); then
-	# Hook direnv into your shell.
   eval "$(direnv hook bash)"
-
 fi

rc.d/fzf

@@ -1,31 +0,0 @@
-#!/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

rc.d/git

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-if (command -v git && command -v fzf) &>/dev/null; then
-    function gsb { git checkout "$(git branch --all | fzf | tr -d '[:space:]')"; }
-fi

rc.d/lsd

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-if (which lsd &> /dev/null)
-then
-
-  # create a aliases
-  alias ls='lsd'
-  alias lt='lsd --tree'
-
-fi

rc.d/mcfly

@@ -1,11 +0,0 @@
-#!/bin/bash
-
-if (command -v mcfly &>/dev/null); then
-  export MCFLY_PROMPT="❯ "
-  export MCFLY_INTERFACE_VIEW=BOTTOM
-  export MCFLY_RESULTS=50
-  export MCFLY_RESULTS_SORT=LAST_RUN
-  # export MCFLY_KEY_SCHEME=vim
-  export MCFLY_FUZZY=3
-  eval "$(mcfly init bash)"
-fi

rc.d/mcfly.bash

@@ -0,0 +1,60 @@
+#!/bin/bash
+
+if ( ! which mcfly &> /dev/null ); then return; fi
+
+# Avoid loading this file more than once
+if [[ "$__MCFLY_LOADED" == "loaded" ]]; then
+  return 0
+fi
+
+__MCFLY_LOADED="loaded"
+export MCFLY_SESSION_ID=$(cat /dev/urandom | env LC_ALL=C tr -dc 'a-zA-Z0-9' | fold -w 24 | head -n 1)
+export MCFLY_HISTORY=$(mktemp -t mcfly.XXXX)
+export HISTFILE="${HISTFILE:-$HOME/.bash_history}"
+
+if [[ -f "$HISTFILE" ]];
+then
+  tail -n100 "${HISTFILE}" >| ${MCFLY_HISTORY}
+else
+  printf "Welcome to McFly\n" >| ${MCFLY_HISTORY}
+fi
+
+# Ignore commands with a leading space
+#export HISTCONTROL="ignorespace"
+
+# Append new history items to .bash_history
+shopt -s histappend
+
+# Setup a function to be used by $PROMPT_COMMAND.
+function mcfly_prompt_command {
+  local exit_code=$? # Record exit status of previous command.
+  history -a ${MCFLY_HISTORY} # Append history to $MCFLY_HISTORY.
+  # Run mcfly with the saved code. It will:
+  # * append commands to $HISTFILE, (~/.bash_history by default)
+  #   for backwards compatibility and to load in new terminal sessions;
+  # * find the text of the last command in $MCFLY_HISTORY and save it to the database.
+  mcfly add --exit ${exit_code} --append-to-histfile
+  # Clear the in-memory history and reload it from $MCFLY_HISTORY
+  # (to remove instances of '#mcfly: ' from the local session history).
+  history -cr ${MCFLY_HISTORY}
+  return ${exit_code} # Restore the original exit code by returning it.
+}
+
+# Set $PROMPT_COMMAND run mcfly_prompt_command and then any existing $PROMPT_COMMAND.
+PROMPT_COMMAND="mcfly_prompt_command;$PROMPT_COMMAND"
+
+# If this is an interactive shell, take ownership of ctrl-r.
+# The logic here is:
+#   1. Jump to the beginning of the edit buffer, add 'mcfly: ', and comment out the current line. We comment out the line
+#      to ensure that all possible special characters, including backticks, are ignored. This commented out line will
+#      end up as the most recent entry in the $MCFLY_HISTORY file.
+#   2. Type "mcfly search" and then run the command. McFly will pull the last line from the $MCFLY_HISTORY file,
+#      which should be the commented-out search from step #1. It will then remove that line from the history file and
+#      render the search UI pre-filled with it.
+if [[ $- =~ .*i.* ]]; then
+  if set -o | grep "vi " | grep -q on; then
+    bind "'\C-r': '\e0i#mcfly: \e\C-j mcfly search\C-j'"
+  else
+    bind "'\C-r': '\C-amcfly: \e# mcfly search\C-j'"
+  fi
+fi

rc.d/mise

@@ -1,8 +0,0 @@
-#!/bin/bash
-
-if (command -v mise &>/dev/null); then
-
-	# activate mise-en-place (https://mise.jdx.dev/)
-	eval "$(mise activate bash)"
-
-fi

rc.d/prompt

@@ -2,44 +2,35 @@
 
 # Customize the prompt
 
-USE_PROMPT=powerline-go
+# Limit the path to 3 levels
+PROMPT_DIRTRIM=3
 
-case "$USE_PROMPT" in
 
-"starship")
+# Use powerline-go if availaible
-	if (command -v starship &>/dev/null); then
-		# echo "Using $USE_PROMPT prompt"
-		eval "$(starship init bash)"
-	else
-		echo "$USE_PROMPT command not found"
-	fi
-	;;
 
-"powerline-go")
+#  -modules string
-	if (command -v powerline-go &>/dev/null); then
+#    	 The list of modules to load, separated by ','
-		# echo "Using $USE_PROMPT prompt"
+#    	 (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
+
+if (which powerline-go &> /dev/null); then
    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)
+     #eval $(powerline-go -shell bash -mode patched -modules "nix-shell,cwd,perms,jobs,git,venv,docker,kube,aws" -modules-right "exit,ssh,user,host" -newline -error $? -eval)
+     eval $(powerline-go -shell bash -mode patched -modules "nix-shell,cwd,perms,jobs,git,venv,aws,docker,kube,exit" -newline -error $? -eval)
    }
-		if [ "$TERM" != "linux" ]; then _prompt_command_add "_update_ps1"; fi
+   if [ "$TERM" != "linux" ] ; then
-	else
+     export PROMPT_COMMAND="_update_ps1; $PROMPT_COMMAND"
-		echo "$USE_PROMPT command not found"
    fi
-	;;
+else
-
-*)
-	# Default simple prompt
   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
-	;;
+fi
-
-esac
-
-# Limit the path to 3 levels
-PROMPT_DIRTRIM=3
 
 # Add a smiley at end of prompt showing last command status code
 #smiley() {

rc.d/tmux

@@ -1,21 +1,25 @@
 #!/bin/bash
 
 # GNU Screen stuff
-if (command -v tmux &>/dev/null); then
+if ( which tmux &> /dev/null )
-  if [ "$(pgrep -u "$UID" "tmux" | wc -l)" -gt 0 ]; then
+then
-    if [[ $TERM != screen* ]]; then
+  if [ $(pgrep -u "$UID" "tmux" | wc -l) -gt 0 ]
+  then
+    if [[ $TERM != screen* ]]
+    then
       nb_sessions=$(tmux list-session | wc -l)
-      nb_sessions_attached=$(tmux list-session | grep -c "attached")
+      nb_sessions_attached=$(tmux list-session | grep "attached" | wc -l)
-      nb_sessions_detached=$(tmux list-session | grep -c -v "attached")
+      nb_sessions_detached=$(tmux list-session | grep -v "attached" | wc -l)
 
-      echo_info "tmux : found ${nb_sessions} session(s)"
+      echo_reverse "Found ${nb_sessions} tmux session(s)"
 
-      echo "➤ ${nb_sessions_attached} session(s) attached"
+      echo " * ${nb_sessions_attached} attached"
-      tmux list-sessions | grep "attached" | sed -e 's/^/    • /'
+      tmux list-sessions | grep "attached" | sed -e 's/^/     - /'
 
-      echo "➤ ${nb_sessions_detached} session(s) detached"
+      echo " * ${nb_sessions_detached} detached"
-      tmux list-sessions | grep -v "attached" | sed -e 's/^/    • /'
+      tmux list-sessions | grep -v "attached" | sed -e 's/^/     - /'
 
     fi
   fi
 fi
+

rc.d/zoxide

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