aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorqblade <qblade@protonmail.com>2021-03-28 00:54:47 +0000
committerMathieu Othacehe <othacehe@gnu.org>2021-04-01 13:40:09 +0200
commitaa03d32eb1d2c41ee6251b3df59eb5177bdf5d82 (patch)
tree4f84d441baa15e3a8252b8351f6251ec88d303ab
parentae15c3fa7ee4e5f6f37ed6faa89df7f797c712e0 (diff)
downloadguix-aa03d32eb1d2c41ee6251b3df59eb5177bdf5d82.tar
guix-aa03d32eb1d2c41ee6251b3df59eb5177bdf5d82.tar.gz
services: kmscon: Add font-engine and font-size fields.
* gnu/services/base.scm (<kmscon-configuration>): Add font-engine and font-size fields. (kmscon-service-type): Honor them. * doc/guix.texi (Base Services): Document them.
-rw-r--r--doc/guix.texi6
-rw-r--r--gnu/services/base.scm13
2 files changed, 17 insertions, 2 deletions
diff --git a/doc/guix.texi b/doc/guix.texi
index f08c529c63..115a7d9bd7 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -15190,6 +15190,12 @@ in automatically without prompting for their login name or password.
@item @code{hardware-acceleration?} (default: #f)
Whether to use hardware acceleration.
+@item @code{font-engine} (default: @code{"pango"})
+Font engine used in Kmscon.
+
+@item @code{font-size} (default: @code{12})
+Font size used in Kmscon.
+
@item @code{kmscon} (default: @var{kmscon})
The Kmscon package to use.
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index f50bcfdcb4..a8214ae96f 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -13,6 +13,7 @@
;;; Copyright © 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2020 Florian Pelz <pelzflorian@pelzflorian.de>
;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
+;;; Copyright © 2021 qblade <qblade@protonmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -2304,7 +2305,11 @@ This service is not part of @var{%base-services}."
(auto-login kmscon-configuration-auto-login
(default #f))
(hardware-acceleration? kmscon-configuration-hardware-acceleration?
- (default #f))) ; #t causes failure
+ (default #f)) ; #t causes failure
+ (font-engine kmscon-configuration-font-engine
+ (default "pango"))
+ (font-size kmscon-configuration-font-size
+ (default 12)))
(define kmscon-service-type
(shepherd-service-type
@@ -2315,13 +2320,17 @@ This service is not part of @var{%base-services}."
(login-program (kmscon-configuration-login-program config))
(login-arguments (kmscon-configuration-login-arguments config))
(auto-login (kmscon-configuration-auto-login config))
- (hardware-acceleration? (kmscon-configuration-hardware-acceleration? config)))
+ (hardware-acceleration? (kmscon-configuration-hardware-acceleration? config))
+ (font-engine (kmscon-configuration-font-engine config))
+ (font-size (kmscon-configuration-font-size config)))
(define kmscon-command
#~(list
#$(file-append kmscon "/bin/kmscon") "--login"
"--vt" #$virtual-terminal
"--no-switchvt" ;Prevent a switch to the virtual terminal.
+ "--font-engine" #$font-engine
+ "--font-size" #$(number->string font-size)
#$@(if hardware-acceleration? '("--hwaccel") '())
"--login" "--"
#$login-program #$@login-arguments