From patchwork Sun Mar 28 03:30:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: qblade X-Patchwork-Id: 28143 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 38F7B27BC66; Sun, 28 Mar 2021 04:31:13 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8A79327BC65 for ; Sun, 28 Mar 2021 04:31:12 +0100 (BST) Received: from localhost ([::1]:51718 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lQM8t-000130-O6 for patchwork@mira.cbaines.net; Sat, 27 Mar 2021 23:31:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58146) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lQM8l-00012c-3H for guix-patches@gnu.org; Sat, 27 Mar 2021 23:31:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33724) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lQM8k-0000Fg-B4 for guix-patches@gnu.org; Sat, 27 Mar 2021 23:31:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lQM8k-00026z-7X for guix-patches@gnu.org; Sat, 27 Mar 2021 23:31:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47441] gnu: services: kmscon-configuration add font-engine, font-size field. Resent-From: qblade Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 28 Mar 2021 03:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 47441 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 47441@debbugs.gnu.org X-Debbugs-Original-To: Guix-patches Received: via spool by submit@debbugs.gnu.org id=B.16169022278072 (code B ref -1); Sun, 28 Mar 2021 03:31:02 +0000 Received: (at submit) by debbugs.gnu.org; 28 Mar 2021 03:30:27 +0000 Received: from localhost ([127.0.0.1]:45270 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQM8B-000267-3T for submit@debbugs.gnu.org; Sat, 27 Mar 2021 23:30:27 -0400 Received: from lists.gnu.org ([209.51.188.17]:53330) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQM88-00025z-Cc for submit@debbugs.gnu.org; Sat, 27 Mar 2021 23:30:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58118) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lQM87-00010a-Qr for guix-patches@gnu.org; Sat, 27 Mar 2021 23:30:24 -0400 Received: from mail4.protonmail.ch ([185.70.40.27]:64443) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lQM85-00087u-4h for guix-patches@gnu.org; Sat, 27 Mar 2021 23:30:23 -0400 Date: Sun, 28 Mar 2021 03:30:09 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1616902217; bh=wmRKPAAmMS0bvK8cOFoN0gg1HzrpbhxZRkIhcwD9/DY=; h=Date:To:From:Reply-To:Subject:From; b=UOAX6lEaKHmLGIkp7gXW0a3H8V4djzUMituBozsyvHqjiFZhTxwS672+vyoGYnjwV f9qnJrOt/XN0rvcaQ7l0hiVWtKaxlyQkFTJuO/Xy2Bpis+YgfkM0zjvO5sTQvanfxk 9SqR58n1kHfy6F9janFrHgK3L+jGtlXuQchaMr1o= Message-ID: MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.40.27; envelope-from=qblade@protonmail.com; helo=mail4.protonmail.ch X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: qblade X-ACL-Warn: , qblade via Guix-patches X-Patchwork-Original-From: qblade via Guix-patches via From: qblade X-getmail-retrieved-from-mailbox: Patches This will give an easier choice for machines that don't want a graphical interface (Xorg, Wayland). The reason why the font-name field is not specified is that it often does not work on my machine, and I think it (in service) requires a font checker (to check if the font is available). From ecb90879fee5bfbf0d3f44d487f8d24bcaf8fea7 Mon Sep 17 00:00:00 2001 From: qblade Date: Sun, 28 Mar 2021 00:54:47 +0000 Subject: [PATCH] services: kmscon: Add font-engine,font-size field * gnu/services/base.scm (, ): Add font-engine,font-size field. --- doc/guix.texi | 6 ++++++ gnu/services/base.scm | 12 ++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index c23d044ff5..cb683d8fb7 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -15178,6 +15178,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..e92cfd90bb 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -2304,7 +2304,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 +2319,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 -- 2.31.0