X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=roles%2Fshell%2Fbash%2Ftemplates%2Fbashrc.j2;fp=roles%2Fshell%2Fbash%2Ftemplates%2Fbashrc.j2;h=0dc80c0962da9f074424121615fb2dcf9e0cbf0b;hb=9f528ac4c4ad219ce91f43d14a97401348f315f3;hp=bf5acfafcb3dc3f695a59cae8712b3d06f4c4dd5;hpb=e7e024a932fe531d0b0b8eea2c048b0de06b43f0;p=perso%2FImmae%2FConfig%2FAnsible.git

diff --git a/roles/shell/bash/templates/bashrc.j2 b/roles/shell/bash/templates/bashrc.j2
index bf5acfa..0dc80c0 100644
--- a/roles/shell/bash/templates/bashrc.j2
+++ b/roles/shell/bash/templates/bashrc.j2
@@ -33,16 +33,17 @@ 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 [[ -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
@@ -50,56 +51,6 @@ function dev_prompt() {
   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
-    elif [ -d "$HOME/workdir/$type" ]; then
-      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"
-    else
-      echo "Unknown session" >&2
-      false
-    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"