summaryrefslogtreecommitdiff
path: root/gnu/home/services
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2021-11-17 23:24:42 +0100
committerLudovic Courtès <ludo@gnu.org>2021-11-17 23:43:14 +0100
commit3a317f7476f8c6012e166ff9f340f861938721c9 (patch)
tree946e398c37912cfc03be7306951ae87bfeb130fa /gnu/home/services
parente55547bf70384691712047912c793c517debd2ec (diff)
parent62e707d67caf1dab2af411a69ff8cec4b2dc686e (diff)
Merge branch 'master' into core-updates-frozen
Diffstat (limited to 'gnu/home/services')
-rw-r--r--gnu/home/services/shells.scm8
-rw-r--r--gnu/home/services/utils.scm2
-rw-r--r--gnu/home/services/xdg.scm2
3 files changed, 6 insertions, 6 deletions
diff --git a/gnu/home/services/shells.scm b/gnu/home/services/shells.scm
index 81d07da86c..80f13a31b7 100644
--- a/gnu/home/services/shells.scm
+++ b/gnu/home/services/shells.scm
@@ -69,7 +69,7 @@ only be extended.
@code{profile} is a list of file-like objects, which will go to
@file{~/.profile}. By default @file{~/.profile} contains the
initialization code, which have to be evaluated by login shell to make
-home-environment's profile avaliable to the user, but other commands
+home-environment's profile available to the user, but other commands
can be added to the file if it is really necessary.
In most cases shell's configuration files are preferred places for
@@ -420,9 +420,9 @@ alias grep='grep --color=auto'\n")
(not (null? ((configuration-field-getter field-obj) config))))
`(,(object->snake-case-string file-name)
,(apply mixed-text-file
- (object->snake-case-string file-name)
- (cons (serialize-field field)
- (if extra-content extra-content '()))))
+ (object->snake-case-string file-name)
+ (append (or extra-content '())
+ (list (serialize-field field)))))
'())))
(filter
diff --git a/gnu/home/services/utils.scm b/gnu/home/services/utils.scm
index cea75ee896..3ce32f80c0 100644
--- a/gnu/home/services/utils.scm
+++ b/gnu/home/services/utils.scm
@@ -28,7 +28,7 @@
list->human-readable-list))
(define (maybe-object->string object)
- "Like @code{object->string} but don't do anyting if OBJECT already is
+ "Like @code{object->string} but don't do anything if OBJECT already is
a string."
(if (string? object)
object
diff --git a/gnu/home/services/xdg.scm b/gnu/home/services/xdg.scm
index 20fb7f7b40..d230dd7665 100644
--- a/gnu/home/services/xdg.scm
+++ b/gnu/home/services/xdg.scm
@@ -136,7 +136,7 @@ are no extensions use configuration instead."
(description "Configure XDG base directories. This
service introduces two additional variables @env{XDG_STATE_HOME},
@env{XDG_LOG_HOME}. They are not a part of XDG specification, at
-least yet, but are convinient to have, it improves the consistency
+least yet, but are convenient to have, it improves the consistency
between different home services. The services of this service-type is
instantiated by default, to provide non-default value, extend the
service-type (using @code{simple-service} for example).")))