me/guix
Archived
1
0
Fork 0
Code Activity

services: kmscon: Add font-engine and font-size fields.

Browse source 
* 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:
qblade 2021-03-28 00:54:47 +00:00 • committed by Mathieu Othacehe
parent ae15c3fa7e
commit aa03d32eb1
No known key found for this signature in database
GPG key ID: 8354763531769CA6
2 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
doc/guix.texi
View file

@ -15190,6 +15190,12 @@ in automatically without prompting for their login name or password.
@item @code{hardware-acceleration?} (default: #f) @item @code{hardware-acceleration?} (default: #f)
Whether to use hardware acceleration. 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}) @item @code{kmscon} (default: @var{kmscon})
The Kmscon package to use. The Kmscon package to use.

13
gnu/services/base.scm
View file

@ -13,6 +13,7 @@
;;; Copyright © 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2020 Florian Pelz <pelzflorian@pelzflorian.de> ;;; Copyright © 2020 Florian Pelz <pelzflorian@pelzflorian.de>
;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re> ;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
;;; Copyright © 2021 qblade <qblade@protonmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; 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 (auto-login kmscon-configuration-auto-login
(default #f)) (default #f))
(hardware-acceleration? kmscon-configuration-hardware-acceleration? (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 (define kmscon-service-type
(shepherd-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-program (kmscon-configuration-login-program config))
(login-arguments (kmscon-configuration-login-arguments config)) (login-arguments (kmscon-configuration-login-arguments config))
(auto-login (kmscon-configuration-auto-login 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 (define kmscon-command
#~(list #~(list
#$(file-append kmscon "/bin/kmscon") "--login" #$(file-append kmscon "/bin/kmscon") "--login"
"--vt" #$virtual-terminal "--vt" #$virtual-terminal
"--no-switchvt" ;Prevent a switch to the 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") '()) #$@(if hardware-acceleration? '("--hwaccel") '())
"--login" "--" "--login" "--"
#$login-program #$@login-arguments #$login-program #$@login-arguments