amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

services: console-font: A single service handles all the VTs.

Browse source 
* gnu/services/base.scm (%default-console-font): New variable.
(console-font-shepherd-services): New procedure.
(console-font-service-type): Change to use 'service-type'.
(console-font-service): Rewrite using 'simple-service'.
(%base-services): Use a single CONSOLE-FONT-SERVICE-TYPE instance.
* gnu/system/install.scm (installation-services): Likewise.
This commit is contained in:
Ludovic Courtès 2016-09-19 23:36:17 +09:00
parent 71654dfdda
commit 4a84a48742
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
2 changed files with 52 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

48
gnu/services/base.scm
View file

@ -58,6 +58,8 @@
session-environment-service-type session-environment-service-type
host-name-service host-name-service
console-keymap-service console-keymap-service
%default-console-font
console-font-service-type
console-font-service console-font-service
udev-configuration udev-configuration
@ -635,11 +637,16 @@ strings or string-valued gexps."
"Return a service to load console keymaps from @var{files}." "Return a service to load console keymaps from @var{files}."
(service console-keymap-service-type files)) (service console-keymap-service-type files))
(define console-font-service-type (define %default-console-font
(shepherd-service-type ;; Note: 'LatGrkCyr-8x16' has the advantage of providing three common
'console-font ;; scripts as well as glyphs for em dash, quotation marks, and other Unicode
(match-lambda ;; codepoints notably found in the UTF-8 manual.
((tty font) "LatGrkCyr-8x16")
(define (console-font-shepherd-services tty+font)
"Return a list of Shepherd services for each pair in TTY+FONT."
(map (match-lambda
((tty . font)
(let ((device (string-append "/dev/" tty))) (let ((device (string-append "/dev/" tty)))
(shepherd-service (shepherd-service
(documentation "Load a Unicode console font.") (documentation "Load a Unicode console font.")
@ -657,15 +664,24 @@ strings or string-valued gexps."
(system* (string-append #$kbd "/bin/setfont") (system* (string-append #$kbd "/bin/setfont")
"-C" #$device #$font))))) "-C" #$device #$font)))))
(stop #~(const #t)) (stop #~(const #t))
(respawn? #f))))))) (respawn? #f)))))
tty+font))
(define console-font-service-type
(service-type (name 'console-fonts)
(extensions
(list (service-extension shepherd-root-service-type
console-font-shepherd-services)))
(compose concatenate)
(extend append)))
(define* (console-font-service tty #:optional (font "LatGrkCyr-8x16")) (define* (console-font-service tty #:optional (font "LatGrkCyr-8x16"))
"Return a service that sets up Unicode support in @var{tty} and loads "This procedure is deprecated in favor of @code{console-font-service-type}.
Return a service that sets up Unicode support in @var{tty} and loads
@var{font} for that tty (fonts are per virtual console in Linux.)" @var{font} for that tty (fonts are per virtual console in Linux.)"
;; Note: 'LatGrkCyr-8x16' has the advantage of providing three common (simple-service (symbol-append 'console-font- (string->symbol tty))
;; scripts as well as glyphs for em dash, quotation marks, and other Unicode console-font-service-type `((,tty . ,font))))
;; codepoints notably found in the UTF-8 manual.
(service console-font-service-type (list tty font)))
(define %default-motd (define %default-motd
(plain-file "motd" "This is the GNU operating system, welcome!\n\n")) (plain-file "motd" "This is the GNU operating system, welcome!\n\n"))
@ -1497,12 +1513,10 @@ This service is not part of @var{%base-services}."
;; Convenience variable holding the basic services. ;; Convenience variable holding the basic services.
(list (login-service) (list (login-service)
(console-font-service "tty1") (service console-font-service-type
(console-font-service "tty2") (map (lambda (tty)
(console-font-service "tty3") (cons tty %default-console-font))
(console-font-service "tty4") '("tty1" "tty2" "tty3" "tty4" "tty5" "tty6")))
(console-font-service "tty5")
(console-font-service "tty6")
(mingetty-service (mingetty-configuration (mingetty-service (mingetty-configuration
(tty "tty1"))) (tty "tty1")))

10
gnu/system/install.scm
View file

@ -313,12 +313,10 @@ You have been warned. Thanks for being so brave.
(cow-store-service) (cow-store-service)
;; Install Unicode support and a suitable font. ;; Install Unicode support and a suitable font.
(console-font-service "tty1") (service console-font-service-type
(console-font-service "tty2") (map (lambda (tty)
(console-font-service "tty3") (cons tty %default-console-font))
(console-font-service "tty4") '("tty1" "tty2" "tty3" "tty4" "tty5" "tty6")))
(console-font-service "tty5")
(console-font-service "tty6")
;; To facilitate copy/paste. ;; To facilitate copy/paste.
(gpm-service) (gpm-service)