From adb808a68365c977320673f9cdbec32e11b77c6a Mon Sep 17 00:00:00 2001
From: Franziska Kunsmann <hi@kunsmann.eu>
Date: Sun, 14 Mar 2021 17:14:08 +0100
Subject: [PATCH] bundles/users: more colourful bash for everyone

---
 bundles/users/files/bashrc          | 8 ++++----
 data/users/files/bash/sophie.bashrc | 1 -
 2 files changed, 4 insertions(+), 5 deletions(-)
 delete mode 100644 data/users/files/bash/sophie.bashrc

diff --git a/bundles/users/files/bashrc b/bundles/users/files/bashrc
index 63e34b0..4fc13e3 100644
--- a/bundles/users/files/bashrc
+++ b/bundles/users/files/bashrc
@@ -5,16 +5,16 @@ __node_name="${node.name}"
 <%text>
 if [[ "$(id -u)" -eq 0 ]]
 then
-    export PS1='\[\e[1;34m\][\[\e[1;32m\]'"$__node_name"'\[\e[1;34m\]][\[\e[1;32m\]\u\[\e[1;34m\]@\[\e[1;32m\]\w\[\e[1;34m\]] $PRODWARNING> \[\e[0m\]'
+    export PS1='\[\e[1;34m\][\[\e[1;91m\]'"$__node_name"'\[\e[1;34m\]][\[\e[1;91m\]\u\[\e[1;34m\]@\[\e[1;91m\]$PWD\[\e[1;34m\]] > \[\e[0m\]'
 else
-    export PS1='\[\e[1;0m\]['"$__node_name"'][\u@\w]\[\e[1;34m\] $PRODWARNING\[\e[1;0m\]> '
+    export PS1='\[\e[1;34m\][\[\e[1;32m\]'"$__node_name"'\[\e[1;34m\]][\[\e[1;32m\]\u\[\e[1;34m\]@\[\e[1;32m\]\w\[\e[1;34m\]] > \[\e[0m\]'
 fi
 case $TERM in
     xterm*|rxvt*)
-        export PROMPT_COMMAND='echo -ne "\a\e]0;'"$__node_name"':${PWD/$HOME/~}\a"'
+        export PROMPT_COMMAND='echo -ne "\a\e]0;'"$__node_name"':${PWD}\a"'
         ;;
     screen*)
-        export PROMPT_COMMAND='echo -ne "\a\ek'"$__node_name"':${PWD/$HOME/~}\e\\"'
+        export PROMPT_COMMAND='echo -ne "\a\ek'"$__node_name"':${PWD}\e\\"'
         ;;
     *)
         unset PROMPT_COMMAND
diff --git a/data/users/files/bash/sophie.bashrc b/data/users/files/bash/sophie.bashrc
deleted file mode 100644
index 3cd6aec..0000000
--- a/data/users/files/bash/sophie.bashrc
+++ /dev/null
@@ -1 +0,0 @@
-export PS1='\[\e[1;34m\][\[\e[1;32m\]'"$__node_name"'\[\e[1;34m\]][\[\e[1;32m\]\u\[\e[1;34m\]@\[\e[1;32m\]\w\[\e[1;34m\]] $PRODWARNING> \[\e[0m\]'