X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=roles%2Fshell%2Fbash%2Ftemplates%2Fbashrc.j2;h=91311e5eb8060276f668f48d138c6f83f3f74782;hb=dd308b2f8fdd6cfb2aec4778c347a7d156a0d754;hp=99ed55f9919c2cb7dbcdc10069003df462e4e77e;hpb=c235f9bea368316f1c1a441ebf6877e05e7df21c;p=perso%2FImmae%2FConfig%2FAnsible.git

diff --git a/roles/shell/bash/templates/bashrc.j2 b/roles/shell/bash/templates/bashrc.j2
index 99ed55f..91311e5 100644
--- a/roles/shell/bash/templates/bashrc.j2
+++ b/roles/shell/bash/templates/bashrc.j2
@@ -2,7 +2,7 @@
 # ~/.bashrc
 #
 
-[[ -f "$HOME/.bashrc_temp" ]] && . $HOME/.bashrc_temp
+[[ -f "$XDG_STATE_HOME/bash/bashrc_temp" ]] && . $XDG_STATE_HOME/bash/bashrc_temp
 
 if [ -n "$HOME/.local/bin" ]; then
   PATH="$HOME/.local/bin:$PATH"
@@ -13,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'
@@ -27,7 +29,9 @@ 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'
+
+[[ -f /usr/share/stgit/completion/stgit-completion.bash ]] && . /usr/share/stgit/completion/stgit-completion.bash
 
 {% if role.get(profile) == "fretlink" %}
 ##### Some Fretlink aliases
@@ -45,6 +49,58 @@ function dev_prompt() {
     echo "{$FRETLINK_ENV} "
   fi
 }
+
+function tmux_dev() {
+  type="${1:-bash}"
+  if [ -n "$TMUX" ]; then
+    m=switch-client
+  else
+    m=attach-session
+  fi
+
+  case "$type" in
+    "bash") start_dir="$HOME";;
+    "remote") start_dir="$HOME";;
+    "puppet") start_dir="/etc/puppetlabs/code"
+  esac
+
+  if tmux has-session -t "$type" 2>/dev/null; then
+    tmux $m -t "$type"
+  else
+    if [ "$type" = "remote" ]; then
+      tmux new-session -d -c $start_dir -s "$type" mosh immae.eu \; \
+          $m -t "$type"
+    elif [ -n "$start_dir" ]; then
+      tmux new-session -d -c $start_dir -s "$type" \; \
+          $m -t "$type" \; \
+          new-window -c $start_dir
+    else
+      tmux new-session -d -c "$HOME/workdir/$type" -s "$type" \; \
+          $m -t "$type" \; \
+          send-keys "../start" C-m \; \
+          rename-window "running" \; \
+          new-window -c "$HOME/workdir/$type"
+    fi
+  fi
+}
+
+_tmux_dev() {
+  COMPREPLY=()
+  local cur="${COMP_WORDS[COMP_CWORD]}"
+  prefix="$HOME/workdir/"
+  local IFS=$'\n'
+  local items=($(IFS=' ' compgen -W "bash remote puppet" -- $cur) $(compgen -d $prefix$cur))
+  for item in ${items[@]}; do
+    [[ $item == $prefix.* ]] && continue
+    COMPREPLY+=("${item#$prefix}")
+  done
+}
+complete -o filenames -F _tmux_dev tmux_dev
+
+if [ -n "$TMUX" ]; then
+  TMUX_SESSION_NAME=$(tmux display-message -p "#S")
+  export HISTFILE="$XDG_STATE_HOME/bash/tmux_${TMUX_SESSION_NAME}_history"
+fi
 ##### /Fretlink
 {% endif %}
 
@@ -71,6 +127,7 @@ function git_prompt() {
     echo -e "($gitinfo) "
   fi
 }
+{% set ps1_git = '\[$(git_prompt_color)\]$(git_prompt)' %}
 
 function error_code() {
   ret=$?
@@ -85,12 +142,19 @@ function running_jobs() {
     echo "[$ret] "
   fi
 }
+{% set ps1_status = '\[\\033[01;31m\]$(error_code)\[\\033[00;00m\]$(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\] '
-{% endif %}
+{# Ensure new line before the prompt #}
+{% set ps1_newline = '$(printf "%$((`tput cols`-1))s\\r")' -%}
+
+{% set ps1_other = '' %}
+{% if role.get(profile) == "fretlink" -%}
+  {% set ps1_other = '\[\\033[01;32m\]$(dev_prompt)' %}
+{%- endif %}
+
+PS1='{{ ps1_newline }}{{ ps1_status }}{{ ps1_other }}{{ ps1_git }}\[\033[00;32m\]\u@\h\[\033[94m\] \w \$\[\033[00m\] '
+
+PROMPT_COMMAND="[[ -f $XDG_STATE_HOME/bash/bashrc_temp ]] && . $XDG_STATE_HOME/bash/bashrc_temp"
 
 {% if "nodejs" in features.get(profile, []) %}
 source /usr/share/nvm/init-nvm.sh