me
/
guix
Archived
1
0
Fork 0
Code

home: services: bash: Move default PS1 prompt to bashrc 

Fixes <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
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
master
Richard Sent 2024-04-04 18:53:27 -04:00 committed by Ludovic Courtès
parent 08bb2dbb13
commit 44c8ce8334
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gnu/home/services/shells.scm
View File

@ -415,21 +415,17 @@ if [ -f ~/.profile ]; then source ~/.profile; fi
if [ -f ~/.bashrc ]; then source ~/.bashrc; 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 'bash-profile)
(serialize-field 'environment-variables))) (serialize-field 'environment-variables)))
,@(list (file-if-not-empty ,@(list (file-if-not-empty
'bashrc 'bashrc
(if (home-bash-configuration-guix-defaults? config) (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)) (serialize-field 'aliases))
(list (serialize-field 'aliases)))) (list (serialize-field 'aliases))))
(file-if-not-empty 'bash-logout))))) (file-if-not-empty 'bash-logout)))))