X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=roles%2Fshell%2Fbash%2Ftemplates%2Fbashrc.j2;h=08518c9dca101e731573bb85154913c7c132c9d4;hb=1f22cde1b4257989d92877f1cc83a2b81e26981c;hp=2018f55754c0403db7785e5758fc06aa982c9615;hpb=a65169cc0ad0e83e0febb22686e7efc250101615;p=perso%2FImmae%2FConfig%2FAnsible.git

diff --git a/roles/shell/bash/templates/bashrc.j2 b/roles/shell/bash/templates/bashrc.j2
index 2018f55..08518c9 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"
@@ -29,6 +29,8 @@ alias rm="rm -i"
 alias psp="pstree -aUp $USER"
 alias dotdrop="dotdrop --cfg $XDG_CONFIG_HOME/dotdrop/config.yaml"
 
+[[ -f /usr/share/stgit/completion/stgit-completion.bash ]] && . /usr/share/stgit/completion/stgit-completion.bash
+
 {% if role.get(profile) == "fretlink" %}
 ##### Some Fretlink aliases
 alias getDump='s3cmd -c <(pass show Travail/Fretlink/S3) get '
@@ -56,13 +58,17 @@ function tmux_dev() {
 
   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 [ -n "$start_dir" ]; then
+    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
@@ -81,13 +87,18 @@ _tmux_dev() {
   local cur="${COMP_WORDS[COMP_CWORD]}"
   prefix="$HOME/workdir/"
   local IFS=$'\n'
-  local items=($(IFS=' ' compgen -W "bash puppet" -- $cur) $(compgen -d $prefix$cur))
+  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 %}
 
@@ -135,6 +146,8 @@ PS1='\[\033[01;31m\]$(error_code)\[\033[00;00m\]$(running_jobs)\[\033[01;32m\]$(
 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 %}
 
+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
 {% endif %}