ssh and tmux configuration fixes

[perso/Immae/Config/Ansible.git] / roles / shell / bash / templates / bashrc.j2

diff --git a/roles/shell/bash/templates/bashrc.j2 b/roles/shell/bash/templates/bashrc.j2
index 0dc80c0962da9f074424121615fb2dcf9e0cbf0b..c7f85224b579b28d436bc72eda2924e655b35df3 100644 (file)
--- a/roles/shell/bash/templates/bashrc.j2
+++ b/roles/shell/bash/templates/bashrc.j2
@@ -31,8 +31,6 @@ alias rm="rm -i"
 alias psp="pstree -aUp $USER"
 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"
@@ -55,6 +53,15 @@ 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 %}