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)))))