Richard Sent wrote 11 months ago
(address . guix-patches@gnu.org)(name . Richard Sent)(address . richard@freakingpenguin.com)
c22ff49a18ad2323e4cf4a7fa6b25d006b50e03a.1712271207.git.richard@freakingpenguin.com
Reported in https://issues.guix.gnu.org/70164.
* home/services/shells.scm (add-bash-configuration): Move default PS1 prompt
from .bash_profile to .bashrc.
Change-Id: Ic437458ee362cc4aa803a71c9962af866749f59a
---
Hi Guix!
See the issue mentioned in the commit message for the motivation for
this patch.
gnu/home/services/shells.scm | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
Toggle diff (34 lines)
diff --git a/gnu/home/services/shells.scm b/gnu/home/services/shells.scm
index 8fd1668b59..a5b2586dde 100644
--- a/gnu/home/services/shells.scm
+++ b/gnu/home/services/shells.scm
@@ -415,14 +415,6 @@ (define (add-bash-configuration config)
if [ -f ~/.bashrc ]; then source ~/.bashrc; fi
"
- ;; The host distro might provide a bad 'PS1' default--e.g., not taking
- ;; $GUIX_ENVIRONMENT into account. Provide a good default here when
- ;; asked to. The default can be overridden below via
- ;; 'environment-variables'.
- (if (home-bash-configuration-guix-defaults? config)
- "PS1='\\u@\\h \\w${GUIX_ENVIRONMENT:+ [env]}\\$ '\n"
- "")
-
(serialize-field 'bash-profile)
(serialize-field 'environment-variables)))
@@ -430,6 +422,10 @@ (define (add-bash-configuration config)
'bashrc
(if (home-bash-configuration-guix-defaults? config)
(list (plain-file-content %default-bashrc)
+ ;; The host distro might provide a bad 'PS1'
+ ;; default--e.g., not taking $GUIX_ENVIRONMENT into
+ ;; account. Provide a good default here when asked.
+ "PS1='\\u@\\h \\w${GUIX_ENVIRONMENT:+ [env]}\\$ '"
(serialize-field 'aliases))
(list (serialize-field 'aliases))))
(file-if-not-empty 'bash-logout)))))
base-commit: ade6845da6cec99f3bca46faac9b2bad6877817e
--
2.41.0