ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-11 13:49:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

home: services: Fix bash aliases without guix-defaults.

Browse source 
* 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>
This commit is contained in:
angryrectangle 2022-03-12 15:28:15 -05:00 committed by Ludovic Courtès
parent 09c7eeb659
commit 3a91c92547
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/guix.texi
View file

@ -38349,7 +38349,7 @@ The Bash package to use.
@item @code{guix-defaults?} (default: @code{#t}) (type: boolean) @item @code{guix-defaults?} (default: @code{#t}) (type: boolean)
Add sane defaults like reading @file{/etc/bashrc} and coloring the output of 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) @item @code{environment-variables} (default: @code{()}) (type: alist)
Association list of environment variables to set for the Bash session. The Association list of environment variables to set for the Bash session. The

4
gnu/home/services/shells.scm
View file

@ -324,7 +324,7 @@ (define-configuration home-bash-configuration
(guix-defaults? (guix-defaults?
(boolean #t) (boolean #t)
"Add sane defaults like reading @file{/etc/bashrc} and coloring the output of "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 (environment-variables
(alist '()) (alist '())
"Association list of environment variables to set for the Bash session. The "Association list of environment variables to set for the Bash session. The
@ -448,7 +448,7 @@ (define* (file-if-not-empty field #:optional (extra-content #f))
'bashrc 'bashrc
(if (home-bash-configuration-guix-defaults? config) (if (home-bash-configuration-guix-defaults? config)
(list (serialize-field 'aliases) guix-bashrc) (list (serialize-field 'aliases) guix-bashrc)
(list (serialize-field 'alises)))) (list (serialize-field 'aliases))))
(file-if-not-empty 'bash-logout))))) (file-if-not-empty 'bash-logout)))))
(define (add-bash-packages config) (define (add-bash-packages config)