12/17: home: services: Fix bash aliases without guix-defaults.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit 3a91c9254798b3555c1ed4cddd07911afe4e3839
Author: angryrectangle <angryrectangle@cock.li>
AuthorDate: Sat Mar 12 15:28:15 2022 -0500

    home: services: Fix bash aliases without guix-defaults.
    
    * gnu/home/services/shells.scm: Fix bash aliases not being added if
      guix-defaults? was #f. Also fix inaccuracy in documentation about 
placement
      of defaults.
    * doc/guix.texi (Shells Home Services): Adjust accordingly.
    
    Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 doc/guix.texi                | 2 +-
 gnu/home/services/shells.scm | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index cb09978fab..46e65129ae 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -38349,7 +38349,7 @@ The Bash package to use.
 
 @item @code{guix-defaults?} (default: @code{#t}) (type: boolean)
 Add sane defaults like reading @file{/etc/bashrc} and coloring the output of
-@command{ls} to the end of the @file{.bashrc} file.
+@command{ls} to the top of the @file{.bashrc} file.
 
 @item @code{environment-variables} (default: @code{()}) (type: alist)
 Association list of environment variables to set for the Bash session.  The
diff --git a/gnu/home/services/shells.scm b/gnu/home/services/shells.scm
index ca7f4ac0ad..9a79db484a 100644
--- a/gnu/home/services/shells.scm
+++ b/gnu/home/services/shells.scm
@@ -324,7 +324,7 @@ source ~/.profile
   (guix-defaults?
    (boolean #t)
    "Add sane defaults like reading @file{/etc/bashrc} and coloring the output 
of
-@command{ls} to the end of the @file{.bashrc} file.")
+@command{ls} to the top of the @file{.bashrc} file.")
   (environment-variables
    (alist '())
    "Association list of environment variables to set for the Bash session.  The
@@ -448,7 +448,7 @@ if [ -f ~/.bashrc ]; then source ~/.bashrc; fi
               'bashrc
               (if (home-bash-configuration-guix-defaults? config)
                   (list (serialize-field 'aliases) guix-bashrc)
-                  (list (serialize-field 'alises))))
+                  (list (serialize-field 'aliases))))
              (file-if-not-empty 'bash-logout)))))
 
 (define (add-bash-packages config)