From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id B04A4163B4; Thu, 20 Feb 2025 08:00:15 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id 913CD1635F; Thu, 20 Feb 2025 08:00:11 +0000 (UTC) Received: from CWXP265CU008.outbound.protection.outlook.com (mail-ukwestazlp170100001.outbound.protection.outlook.com [IPv6:2a01:111:f403:c206::1]) by atuin.qyliss.net (Postfix) with ESMTPS id 7EEFE16359 for ; Thu, 20 Feb 2025 08:00:09 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=CieuO5D5DRODnN4ahOD1NOX6JdcAxTG3SGoRoH7ycT0JJMtNAVEo2CZU/nWRgFiyIlXRdnz3JqMKiKPksWttSbNt5B+JGd98VsPZVsuYX6qexaMoc/Q2M/qmKJrEcQTsTijHqw9c3Tivz6u5gKd8qrpOmhowtBCb8fr2O4PnQSkuvhYEJFseT8Q7/XGlLNC5I5cJSVNLUNwVr7xCauQ5uW83+MuNjZDJCw3mNnFBPxqb1Kgu3WZqxwfg8EPP3picGfBO/clYHha1ZXdthzgDb7V8sy0U8jS83PtvvFeblQDtkvf+dSIzbMc04cjT38nieGUGOyys/OmVCoX/+jsXfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=GlEAAPmGsyCnEAGQV0utikXQv+5WbCyEi8IXnO2N8a4=; b=IqVSAUzXTHfR5yyzZ0ho6WsWKN/OvUaBmIg/RabqlR1cDA/OnxVWayU/8J6vpjFWDIwGCppWsrfpk3AY21owTRjKRzXf92nwWZ84EvxlwWGe/o3xj/9K7pV/R+z/XGjMwAAa01F4FqEKVrbhxTt1mYTQXSwfHanJ34PuypM4ejdEUWX1TuZt02HVGkWxabJncsbHAVucGcKvydCkLoQc15tMf1DSxEvY+lVd+DPtKkFU7wAzh1ZahLoTbxslzH2ZpISCjDcWX/mDGcn3mOFKapys/JiAidtfQdUL/NonscBckm06IBAhs9RDwbPVoBI1UEn2xaxBMDzgCk30f4e2sw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 62.210.214.198) smtp.rcpttodomain=lahfa.xyz smtp.mailfrom=shymega.org.uk; dmarc=pass (p=none sp=none pct=100) action=none header.from=shymega.org.uk; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=shymega.org.uk; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=GlEAAPmGsyCnEAGQV0utikXQv+5WbCyEi8IXnO2N8a4=; b=Glx5ZH5qHlqSWTR9S9LGPcKpYSppNlFs+LDiJcMt30/F7CqUJmXib7vVsFigVmQV+pTBBhCmLZ8hg+JHPb50WxNVVsJIK2SBBlBXIifJrDb18uSi7e5HDvgHgxiXI6TnOqCebh1/s3Wnm9p2oDBmnMgR4XckBDOEdYGcPLmLxoI/t4h3a6iVKJ5BKyzyi46m8WsQbik2de/9jp82MHa7QXtFuYBjwfq33v7q+1iGeubwBpRXAcdzbDOmG/pHoo5jIPjXmEr6eOX005G/FDvEfDgtZeb9gEHlAj0mBJ6d8t8LT7ZuhdTW88JWOrzrE28xwq9ALkJFJ2Yw1AI0OKY4zw== Received: from CWLP123CA0064.GBRP123.PROD.OUTLOOK.COM (2603:10a6:401:59::28) by CWXP265MB2215.GBRP265.PROD.OUTLOOK.COM (2603:10a6:400:74::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.17; Thu, 20 Feb 2025 08:00:05 +0000 Received: from CW2PEPF000056BE.GBRP265.PROD.OUTLOOK.COM (2603:10a6:401:59:cafe::1a) by CWLP123CA0064.outlook.office365.com (2603:10a6:401:59::28) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8466.15 via Frontend Transport; Thu, 20 Feb 2025 08:00:05 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 62.210.214.198) smtp.mailfrom=shymega.org.uk; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=shymega.org.uk; Received-SPF: Pass (protection.outlook.com: domain of shymega.org.uk designates 62.210.214.198 as permitted sender) receiver=protection.outlook.com; client-ip=62.210.214.198; helo=oracle.rodriguez.org.uk; pr=C Received: from oracle.rodriguez.org.uk (62.210.214.198) by CW2PEPF000056BE.mail.protection.outlook.com (10.167.240.22) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8466.11 via Frontend Transport; Thu, 20 Feb 2025 08:00:04 +0000 Received: from DEUSEX-LINUX.localdomain (unknown [217.155.6.253]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) (Authenticated sender: dzrodriguez) by oracle.rodriguez.org.uk (Postfix) with ESMTPSA id 5FA84ACA004D; Thu, 20 Feb 2025 08:00:04 +0000 (UTC) Received: from DEUSEX-LINUX (localhost [IPv6:::1]) by DEUSEX-LINUX.localdomain (Postfix) with SMTP id 721E54201BC; Thu, 20 Feb 2025 00:32:09 +0000 (GMT) Date: Thu, 20 Feb 2025 00:32:09 +0000 From: "Dom (shymega) Rodriguez" To: Samy Lahfa Subject: Re: [PATCH v3] img/app: add dejavu_fonts pkg and fontconfig file Message-ID: References: <20250215222254.2950904-1-samy+spectrum@lahfa.xyz> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Disposition: inline In-Reply-To: <20250215222254.2950904-1-samy+spectrum@lahfa.xyz> X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CW2PEPF000056BE:EE_|CWXP265MB2215:EE_ X-MS-Office365-Filtering-Correlation-Id: bdaab539-bc73-4097-52e8-08dd518495dd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|1800799024|82310400026|36860700013|7053199007; X-Microsoft-Antispam-Message-Info: =?utf-8?B?VFRBZmlGWGIvY2pPR05MUDB3K201MTFQRGJSZjVzK21ObkFrRnFoRENHNTJI?= =?utf-8?B?L0tROEVlY3VZenFmWmp0dTlPdnNHci91WGl4TTJFRWx2L0xlZTFrNm5nQ1FS?= =?utf-8?B?eFdjRUJkNUFwRGU2c2VvMnphSXdoczlqZlhMaHllYjI1dzJhNktFa3o0NlV1?= =?utf-8?B?ZG0wNisvbUM4Z2MvNVVRSC9aa1hkUEtqcmwydklDVUQvNTlNMWxsNkNWeGov?= =?utf-8?B?MTVZbGFQM1NVcFFoZXRHT2dBdGZqVG02TU53dzI5MnJaNWdpd0prK3pGZk5X?= =?utf-8?B?TjUzQjhaNkJaMys4M3BIUTNzaFRiVmdRZFhMUmRQY1piSk9EZFZIU3hueDFN?= =?utf-8?B?ZnppR0pCaTJpMlZiQm5sdGJiTStHcmRTbzQzc1J6dzJQSW8zZ0dYRXF4Yndr?= =?utf-8?B?eUREYytpSURMYW81Z0xTdW1adm9pYWpJUUxEVFlOTng0cGIwaUx4RWd6U09U?= =?utf-8?B?S09FM2ZOOWxEZVZ0cHVmbTU1ejBFd1ZhbnVoNE8yV3dEeUh5bkFMTWpsRnow?= =?utf-8?B?amxUN1JQVklzV0JrSm16a3hlV0JEN21BUi9SWlZldnNTL2hYaEpWcVdVeGlV?= =?utf-8?B?dXJkMlNvRk11TkpQV0Y3U1ROZFZmTUNmbjFLM05OSGhqSUpDMjh2b3RreDh5?= =?utf-8?B?WHp6VEx3akRIMWV2V3poNWpieWhwSHFPeFlIUzhwQjA2aTFkWkVaNkR4MG1s?= =?utf-8?B?UWZvTUVqKzFtZm0xQ3V0WDQ1QmhNVGJCME9PTHlxTFRHcTJRTFVjb0JqM3I1?= =?utf-8?B?c3g2U1NPcWNUTGZnS0p5Rk0wYlJvS1grVEVzclNtU0g1L0N1S3RwSklQeHdm?= =?utf-8?B?dFJhZzVxSEx4bG5MK0s4TEsvZkozODZVTENld0xXNlNpNTBDbEtWN3ROWVNo?= =?utf-8?B?UllCME85VkR6YUVkbDM5TVZYcVo5SjM2MGl2SFc3YlBvSjROWW5JZ2tQNU0w?= =?utf-8?B?Y0Jwa0JNR0dCbUhZY3g1UzNIMVVZdlZ0SGU5SFRTdlNibEU5TzNzVFNvUEwv?= =?utf-8?B?WEx1NUlvbS9lVnRZNkk0blZXSGNOM1VGdkVPM1M3UnN3djAyT0RDUkJVdXNX?= =?utf-8?B?YXdrTU1PSGdRUFVjQ0QzZG1iSXdMQ0JxQjh0S3Noc1dDVksrQUlGSlFLNUVs?= =?utf-8?B?KzZZQjY2Yk8zNjYrd0c0SG9sSUxsb3I3R0ZkZVBoY1VBUmlLeXRZZTA5THF4?= =?utf-8?B?ek9yYnZ6VEdsbDgrYU84dkxDS1orbFVlVmpJN25OZnZuWERZbzY4NjJETWJH?= =?utf-8?B?c05Qc1JsWGJHTnllK0xnK1M5TFBqK0NhODhSMHA3aVJ0ZG8wdkU0MUVscEx0?= =?utf-8?B?N0FRRVg0K3E2L2poWTNMa2taNXFZQ21RcHc5L3ZjWlQybEdXaEhxMU9KSGd3?= =?utf-8?B?MUZ3UzdtODE4d1A4ZExHazYyaisyMmh0eVZLczUzSWVrRlg5QWpoc1ZkQ2sv?= =?utf-8?B?eloyMDIwZXdkSDgzNmxtaDZWSGxhb2xNNVE2NHphMjRla0ZYNGxIL3lyd3Yw?= =?utf-8?B?VlUxT0ZFbjQ1ZWFLNkdIVlhsS1pMVkZob2NyODZyN1dnRmFjbnF5a2REN0RX?= =?utf-8?B?cTFkd0pJOGFsd3Z1Q3FvMzZXUmYwdzlEZTZTNmlacUtJTFA1Y09OTGxDY2k0?= =?utf-8?B?d3ZQTUsxYjg1Q2JlOFR6NG1EdUtRazlyUVA5MEdFYSsrdWpwZ3RsR0ZEK2g3?= =?utf-8?B?bWJDTUlVOG9NbUFMcDlva1k5d1JPODJKZzB2Q2pBa3lrZWcxR0xweGVJWXV2?= =?utf-8?B?NDFHOUhnNklBblhTd0JGWWx4enFBK1J6WVFiNmpMdFI0ekFPZEtHQWFnTEJr?= =?utf-8?B?QysvK1NHOWZPaFA5U3VpRFNSZkFISjFLR1F1c0lhQksvcjE2eW1KazBVM1pN?= =?utf-8?B?c0lyWjRaanhYY25kV3ZUSGVFemV5Rk9qOGQrWDllS1RlWVhjU0t6OHRKeC9z?= =?utf-8?B?WkZ5WlZzZ0pvbEJId1JQd1k5ckZxUkxnNnMyZ0VhYWgzQldWc3hOUUFmeTFX?= =?utf-8?B?bVpwdm90SEdRPT0=?= X-Forefront-Antispam-Report: CIP:62.210.214.198;CTRY:FR;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:oracle.rodriguez.org.uk;PTR:oracle.rodriguez.org.uk;CAT:NONE;SFS:(13230040)(376014)(1800799024)(82310400026)(36860700013)(7053199007);DIR:OUT;SFP:1102; X-OriginatorOrg: shymega.org.uk X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Feb 2025 08:00:04.7696 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bdaab539-bc73-4097-52e8-08dd518495dd X-MS-Exchange-CrossTenant-Id: 7e15dc52-0465-4028-b82a-3c894bbc5ba6 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=7e15dc52-0465-4028-b82a-3c894bbc5ba6;Ip=[62.210.214.198];Helo=[oracle.rodriguez.org.uk] X-MS-Exchange-CrossTenant-AuthSource: CW2PEPF000056BE.GBRP265.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CWXP265MB2215 Message-ID-Hash: CZQKUKMGZUXA22SAZXRA7H6S3WBZKZTL X-Message-ID-Hash: CZQKUKMGZUXA22SAZXRA7H6S3WBZKZTL X-MailFrom: shymega@shymega.org.uk X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-devel.spectrum-os.org-0; header-match-devel.spectrum-os.org-1; header-match-devel.spectrum-os.org-2; header-match-devel.spectrum-os.org-3; header-match-devel.spectrum-os.org-4; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: devel@spectrum-os.org X-Mailman-Version: 3.3.9 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Hi Samy, On 15.02.2025 23:22, Samy Lahfa wrote: >Signed-off-by: Samy Lahfa > >This fixes the foot terminal app-vm by adding dejavu_fonts package to the >nix store as well as adding the fontconfig file, so it knows which >default font to use. >--- > img/app/Makefile | 2 ++ > img/app/default.nix | 3 ++- > img/app/etc/fonts/fonts.conf | 21 +++++++++++++++++++++ > 3 files changed, 25 insertions(+), 1 deletion(-) > create mode 100644 img/app/etc/fonts/fonts.conf > >diff --git a/img/app/Makefile b/img/app/Makefile >index 7887aa8..eeb17fa 100644 >--- a/img/app/Makefile >+++ b/img/app/Makefile >@@ -30,6 +30,7 @@ $(imgdir)/appvm/blk/root.img: ../../scripts/make-gpt.sh ../../scripts/sfdisk-fie > > VM_FILES = \ > etc/dbus-1/session.conf \ >+ etc/fonts/fonts.conf \ > etc/fstab \ > etc/init \ > etc/mdev.conf \ >@@ -52,6 +53,7 @@ VM_FILES = \ > etc/s6-linux-init/scripts/rc.shutdown \ > etc/s6-linux-init/scripts/rc.shutdown.final \ > etc/xdg/xdg-desktop-portal/portals.conf >+ > VM_DIRS = dev run proc sys tmp \ > etc/s6-linux-init/run-image/service > VM_FIFOS = etc/s6-linux-init/run-image/service/s6-linux-init-shutdownd/fifo >diff --git a/img/app/default.nix b/img/app/default.nix >index 6537fb2..5b58a5f 100644 >--- a/img/app/default.nix >+++ b/img/app/default.nix >@@ -8,7 +8,7 @@ pkgsStatic.callPackage ( > { lib, stdenvNoCC, runCommand, writeClosure > , erofs-utils, jq, s6-rc, util-linux > , busybox, cacert, execline, kmod, linux_latest, mdevd, s6, s6-linux-init >-, xdg-desktop-portal-spectrum >+, xdg-desktop-portal-spectrum, dejavu_fonts, > }: > > let >@@ -37,6 +37,7 @@ let > s6-rc > terminfo > xdg-desktop-portal-spectrum >+ dejavu_fonts The only thing remaining is to sort dejavu_fonts alphabetically, but it's no biggie, and Alyssa I'm sure would be happy to fix this up in the tree. > > # Some packages can't (currently?) be built statically. > >diff --git a/img/app/etc/fonts/fonts.conf b/img/app/etc/fonts/fonts.conf >new file mode 100644 >index 0000000..0dcde54 >--- /dev/null >+++ b/img/app/etc/fonts/fonts.conf >@@ -0,0 +1,21 @@ >+ >+ >+ >+ >+ >+ >+ monospace >+ >+ DejaVu Sans Mono >+ >+ >+ >+ >+ sans-serif >+ >+ DejaVu Sans >+ >+ >+ >+ /usr/share/fonts >+ >-- >2.47.2 > LGTM - thank you for your patch! Best wishes, -- Dom Rodriguez