2 files changed, 16 insertions, 8 deletions

diff --git a/roles/shell/bash/templates/bash_profile.j2 b/roles/shell/bash/templates/bash_profile.j2
index 8ffd818..4bcd09c 100644
--- a/roles/shell/bash/templates/bash_profile.j2
+++ b/roles/shell/bash/templates/bash_profile.j2
@@ -1,6 +1,8 @@
 # Some variables are loaded via pam (see .config/pam_environment)
+# This file is loaded thanks to as line in /etc/profile
+# test "$BASH" && test -r "$XDG_CONFIG_HOME/bash/bash_profile" && . $XDG_CONFIG_HOME/bash/bash_profile
 
-[[ -f ~/.bashrc ]] && . ~/.bashrc
+[[ -f $XDG_CONFIG_HOME/bash/bashrc ]] && . $XDG_CONFIG_HOME/bash/bashrc
 {% if "graphical_vt" in features.get(profile, []) %}
 
 if [[ ! $DISPLAY && $XDG_VTNR -eq 1 ]]; then
diff --git a/roles/shell/bash/templates/bashrc.j2 b/roles/shell/bash/templates/bashrc.j2
index 08518c9..b717f0e 100644
--- a/roles/shell/bash/templates/bashrc.j2
+++ b/roles/shell/bash/templates/bashrc.j2
@@ -27,7 +27,7 @@ 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
 
@@ -125,6 +125,7 @@ function git_prompt() {
     echo -e "($gitinfo) "
   fi
 }
+{% set ps1_git = '\[$(git_prompt_color)\]$(git_prompt)' %}
 
 function error_code() {
   ret=$?
@@ -139,14 +140,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"
+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