From 44c8ce8334ade3612747d72784fa4af9fdaa71f4 Mon Sep 17 00:00:00 2001 From: Richard Sent Date: Thu, 4 Apr 2024 18:53:27 -0400 Subject: home: services: bash: Move default PS1 prompt to bashrc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . * home/services/shells.scm (add-bash-configuration): Move default PS1 prompt from .bash_profile to .bashrc. Change-Id: Ic437458ee362cc4aa803a71c9962af866749f59a Signed-off-by: Ludovic Courtès --- gnu/home/services/shells.scm | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'gnu/home') diff --git a/gnu/home/services/shells.scm b/gnu/home/services/shells.scm index 8fd1668b59..ee6b09f17c 100644 --- a/gnu/home/services/shells.scm +++ b/gnu/home/services/shells.scm @@ -415,21 +415,17 @@ if [ -f ~/.profile ]; then source ~/.profile; fi 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))) ,@(list (file-if-not-empty 'bashrc (if (home-bash-configuration-guix-defaults? config) - (list (plain-file-content %default-bashrc) + (list (plain-file-content %default-bashrc) "\n" + ;; 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]}\\$ '\n" (serialize-field 'aliases)) (list (serialize-field 'aliases)))) (file-if-not-empty 'bash-logout))))) -- cgit v1.2.3