X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=roles%2Fshell%2Fbash%2Ftemplates%2Fbashrc.j2;h=d6db656bc6d4cc160c9a1659c4916ac676edabd5;hb=HEAD;hp=2285d2b656562b5c5ee957d3d95564ed05a37656;hpb=397c4fed757d201af627636822981e85e84ea572;p=perso%2FImmae%2FConfig%2FAnsible.git

diff --git a/roles/shell/bash/templates/bashrc.j2 b/roles/shell/bash/templates/bashrc.j2
index 2285d2b..d6db656 100644
--- a/roles/shell/bash/templates/bashrc.j2
+++ b/roles/shell/bash/templates/bashrc.j2
@@ -2,6 +2,8 @@
 # ~/.bashrc
 #
 
+[[ -f "$XDG_STATE_HOME/bash/bashrc_temp" ]] && . $XDG_STATE_HOME/bash/bashrc_temp
+
 if [ -n "$HOME/.local/bin" ]; then
   PATH="$HOME/.local/bin:$PATH"
 fi
@@ -11,6 +13,8 @@ fi
 
 export GPG_TTY=$(tty)
 export HISTFILE="$XDG_STATE_HOME/bash/history"
+export HISTTIMEFORMAT='%F %T '
+export HISTCONTROL="ignorespace:ignoredups"
 
 alias vi=vim
 alias ls='ls --color=auto -F -T 0'
@@ -25,24 +29,39 @@ alias mv="mv -i"
 alias cp="cp -i"
 alias rm="rm -i"
 alias psp="pstree -aUp $USER"
-alias dotdrop="dotdrop --cfg $XDG_CONFIG_HOME/dotdrop/config.yaml"
+alias info='info -v active-link-style=yellow,bold -v link-style=yellow'
+
+if [[ -d "$XDG_DATA_HOME/bash_completion" ]]; then
+  for i in $XDG_DATA_HOME/bash_completion/*; do
+    [[ -f "$i" && -r "$i" ]] && . "$i"
+  done
+fi
 
 {% if role.get(profile) == "fretlink" %}
 ##### Some Fretlink aliases
-alias getDump='s3cmd -c <(pass show Travail/Fretlink/S3) get '
-
-function vpn() {
-  TMPFILE=$(mktemp /tmp/openvpn.XXXXXX)
-  pass show Travail/Fretlink/OpenVPN >> $TMPFILE
-  sudo openvpn $TMPFILE
-  rm -f $TMPFILE
-}
+alias vpn=fl_vpn
+alias tmux_dev=fl_tmux_dev
+complete -o filenames -F _fl_tmux_dev tmux_dev
 
 function dev_prompt() {
   if [ -n "$FRETLINK_ENV" ]; then
     echo "{$FRETLINK_ENV} "
   fi
 }
+
+if [ -n "$TMUX" ]; then
+  TMUX_SESSION_NAME=$(tmux display-message -p "#S")
+  export HISTFILE="$XDG_STATE_HOME/bash/tmux_${TMUX_SESSION_NAME}_history"
+fi
+
+function load_dev_env() {
+  if [ -z "$1" ]; then
+    source ../environment
+  else
+    FL_ENV="$1" source ../environment
+  fi
+}
+
 ##### /Fretlink
 {% endif %}
 
@@ -69,13 +88,7 @@ function git_prompt() {
     echo -e "($gitinfo) "
   fi
 }
-
-function error_code() {
-  ret=$?
-  if [[ $ret != 0  ]]; then
-    echo "$ret "
-  fi
-}
+{% set ps1_git = '\[$(git_prompt_color)\]$(git_prompt)' %}
 
 function running_jobs() {
   ret=$(jobs | wc -l)
@@ -84,11 +97,34 @@ function running_jobs() {
   fi
 }
 
+PROMPT_COMMAND=__prompt_command
+
+__prompt_command () {
+  local ret="$?"
+  PS1=""
+  d="\[\033[00;00m\]"
+  red="\[\033[01;31m\]"
+  bgreen="\[\033[01;32m\]"
+  green="\[\033[00;32m\]"
+  blue="\[\033[94m\]"
+
+  # Ensure new line before the prompt
+  PS1='$(printf "%$((`tput cols`-1))s\r")'
+  if [[ $ret != 0  ]]; then
+    PS1+="$red$ret $d"
+  fi
+  PS1+='$(running_jobs)'
 {% if role.get(profile) == "fretlink" %}
-PS1='\[\033[01;31m\]$(error_code)\[\033[00;00m\]$(running_jobs)\[\033[01;32m\]$(dev_prompt)\[$(git_prompt_color)\]$(git_prompt)\[\033[00;32m\]\u@\h\[\033[94m\] \w \$\[\033[00m\] '
-{% else %}
-PS1='\[\033[01;31m\]$(error_code)\[\033[00;00m\]$(running_jobs)\[$(git_prompt_color)\]$(git_prompt)\[\033[00;32m\]\u@\h\[\033[94m\] \w \$\[\033[00m\] '
+  PS1+="$bgreen"'$(dev_prompt)'
 {% endif %}
+  PS1+='\[$(git_prompt_color)\]$(git_prompt)'
+  PS1+="$green\u@\h$blue \w \$$d "
+}
+
+NIX_PATH=nixpkgs=channel:nixpkgs-unstable
+source /usr/share/fzf/key-bindings.bash
+source /usr/share/fzf/completion.bash
+export FZF_COMPLETION_TRIGGER='#'
 
 {% if "nodejs" in features.get(profile, []) %}
 source /usr/share/nvm/init-nvm.sh