mirror of
git://git.savannah.gnu.org/guix.git
synced 2023-12-14 03:33:07 +01:00
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.
This commit is contained in:
parent
ae15c3fa7e
commit
aa03d32eb1
2 changed files with 17 additions and 2 deletions
|
@ -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.
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue