summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorangryrectangle <angryrectangle@cock.li>2022-03-12 15:28:15 -0500
committerLudovic Courtès <ludo@gnu.org>2022-03-18 16:03:34 +0100
commit3a91c9254798b3555c1ed4cddd07911afe4e3839 (patch)
tree659ec764ca0ff82d6d4eda2fe0bfda40a163461d
parent09c7eeb6599db41a3c4b53b998049141affddf33 (diff)
downloadguix-patches-3a91c9254798b3555c1ed4cddd07911afe4e3839.tar
guix-patches-3a91c9254798b3555c1ed4cddd07911afe4e3839.tar.gz
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>
-rw-r--r--doc/guix.texi2
-rw-r--r--gnu/home/services/shells.scm4
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)