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 5501E368D; Sun, 09 Feb 2025 19:53:48 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id 0B18B3633; Sun, 09 Feb 2025 19:53:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=0.9 required=5.0 tests=ARC_SIGNED,ARC_VALID, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DMARC_PASS,FORGED_SPF_HELO, SPF_HELO_PASS autolearn=no autolearn_force=no version=4.0.1 Received: from LO2P265CU024.outbound.protection.outlook.com (mail-uksouthazlp170110003.outbound.protection.outlook.com [IPv6:2a01:111:f403:c205::3]) by atuin.qyliss.net (Postfix) with ESMTPS id 5213E3630 for ; Sun, 09 Feb 2025 19:53:38 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Kx+JfoRi11T17MjIjAUlefGNnBZPtWUKzJNljzKRv8eq5KhyuNxulQSm5rZi1ZM9z6Q8JFFRyUq0j7ctnvoRED39wJdUdwf87CpoVkYk5a7QxVeraKS1eF27Z1KHaytvF/PnWoMrSKYZt3DcP+4cUBLjdIxU8ZgIQ2iN7vWhLZi6wKkxCKNoH0pSJwhUYw/ApT5+ZZazgG1vRdzjKVSj8rkXeYoIgc9CHlB35DGSvgAMjfEzcf53BXBqc7x5Oi3D5811fKXoXtK7KYZvwBKQtQVJdzZOoUm1teBLudM7WKmHe+Y26T25ZW1kEEXaOv8zviH4kqU6L3oCU93JyWflrA== 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=31Ttx62SusWTg01t+dulVgpTKxWLvGFv8XWBwz4S3d0=; b=wUlmr1vgFgzPNz8oXQYc6zV3DUsyK/f2sfFHaZWvWXYb1POv0eziNZBDXJnFtp0Irg06MQC1M2dg0ub3vwx5MlEmo7eqaviMNlzxb+xtlFab/5SucdB9zPBj3+yqPsmNwerlu/a4/+0F0+6n3xYpza8e/bPBg8zDico1tCi8Znlyj9vm0TAaESexTJPu/DcE8y51woWVbR7q9EzbqTpmQR1UZGH7dtw+GPm5lEEBCExxBzk7Ys4UwU2Y4YCBz1V4cq//YdFKl7q3BbpPRjKAZCqnwWA/w9YqPgliXb+ZP/RTAxG9oe9bPNDqANR9xXIoKXMe6bOu4i3icei+naB29w== 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=31Ttx62SusWTg01t+dulVgpTKxWLvGFv8XWBwz4S3d0=; b=bPpEFFRqRMAQhlJ4n9zeuFJyk5dk+BwGMrfBWEwyKRIDhknDd5PyStFnmkUzaUhdE/+LpKxCl6z9yXHqaC+321TsUl+iAbuPu2TEVkk/KuPEwkCY/MNvxDuqn1D4LTH7U7nA9HyONirocdh5gTpCRV+/vdC5p5yqB0KSewJnPppzPperCS7pKDQiScRAIHY9wWZz15Dlv6TVnV3WfSKAcDqB0zQ4r6oqGr+7QxJev+Um+wL1djagxrpSIl2q3sxZN84brlw6qqmKnfEZpkw807KPmSW1UmDS3AFsWRV+agCk97w/MwjNI+e+oZV6Qeg2Pv6k2+D3C2P2eGlU1k3+RQ== Received: from LO4P265CA0121.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:2c6::9) by LO6P265MB6441.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:2dc::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8422.16; Sun, 9 Feb 2025 19:53:34 +0000 Received: from LO1PEPF000022FF.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:2c6:cafe::91) by LO4P265CA0121.outlook.office365.com (2603:10a6:600:2c6::9) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8398.31 via Frontend Transport; Sun, 9 Feb 2025 19:53:34 +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 LO1PEPF000022FF.mail.protection.outlook.com (10.167.240.23) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8445.10 via Frontend Transport; Sun, 9 Feb 2025 19:53:34 +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 C84BBACA004B; Sun, 9 Feb 2025 19:53:33 +0000 (UTC) Received: from DEUSEX-LINUX (localhost [IPv6:::1]) by DEUSEX-LINUX.localdomain (Postfix) with SMTP id 8F14E14EA2A; Sun, 09 Feb 2025 19:49:52 +0000 (GMT) Date: Sun, 9 Feb 2025 19:49:52 +0000 From: "Dom (shymega) Rodriguez" To: Samy Lahfa Subject: Re: [PATCH v2] img/app: add dejavu_fonts pkg and fontconfig file Message-ID: References: <20250208133634.1963410-1-samy+spectrum@lahfa.xyz> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Disposition: inline In-Reply-To: <20250208133634.1963410-1-samy+spectrum@lahfa.xyz> X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: LO1PEPF000022FF:EE_|LO6P265MB6441:EE_ X-MS-Office365-Filtering-Correlation-Id: 8c62deb3-8960-46d1-ac30-08dd49436fc3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|82310400026|36860700013|1800799024|7053199007; X-Microsoft-Antispam-Message-Info: =?utf-8?B?VnJLVnJOZXZPZWViTWdaYTZhUU54aG1ITmVEcXhvTkJsVHVoa21FK2pJWWZU?= =?utf-8?B?V2RDcnZZZXVYcU5JYkI2RWx0VGZwc09uYXBTbzJtUEJWbWJ2a3BpQy8rQmJx?= =?utf-8?B?SFcvOTI0ZkkwK0thanhBSmFpMEh1bU53ZlllMkE4cGtVTFBpV25xRXRZVWtI?= =?utf-8?B?RFZoMldSeDNYS0FZV0FoTHpQUjhRR1lHbU0xODk1a3pJTGNuQTl1ajdyZ2JF?= =?utf-8?B?K0JzQjRxc0FGV21hUHNFZ0Fhazcyd1YwMDNRUFk3Tjdkd1BnWXE1cjlVWVFX?= =?utf-8?B?anR2RXpsRzdGRVNBMGlOUUpMUnJFT1llRVk3eEpRbk1yekZxWmZDTk5KVUZi?= =?utf-8?B?OEZ2R2tzak9Cd2dnWndCN1FlcmU2YUppSFcwenB1dHVYRXFsV2NpVFppUVVL?= =?utf-8?B?S1doaGN6L1Jza0ZObW5mTDUxUy9ZeG04MUZ4QzI1Sm9GWEtJMGp2UGpNSGhN?= =?utf-8?B?Sm5Ocy8vZTgzcVUzd3pnTnNzTjFxRTRadHVlT1U0SUQyVWJ5ZUZNZjlsa2tZ?= =?utf-8?B?aTllalNyNjdtc25JUkhST0xpL0NwTC9tZFVpeHQ5OWxxdG5LbzZVemc3NDRz?= =?utf-8?B?aVRPaG0wdTFRbEpwSDlIZnZVMlZVa0t1NmFyVjRZZm9UemRVOFJYeERNMkxt?= =?utf-8?B?LzJYMjJqUjMwVTgrc3ZTR1hCVUhRYUV0d1VqKzVWallNRHpMY0lqY0RrMHps?= =?utf-8?B?Q2t6OC9qakFIVms2LzhKVEZVSmdrNHc5ZWJKdGYxQitLNmlSeFBWMDNYcE4w?= =?utf-8?B?NE9wQXVBaW50S1JROUZuREpHbG5YSmt3L2NZMFloNkh3VnZBakQvNzBaU3Rm?= =?utf-8?B?bFdXaytrVTJwVHlxSjFXN3Q2RUszb2F1a0ZnQXFoQzhOcDhzNENwVUhVdTU0?= =?utf-8?B?aEVSR3IwZEwrUWk2bFhLbTFXY3F3L1pueWhJMWVRRTNTSGp2WHFoT0VaMnQ4?= =?utf-8?B?YkZmbEVYY0xxcFUrWnorbUVZU011M21aT2Z1R2ZEWWhrN25NWUNXRnltdWhX?= =?utf-8?B?ZFBMVzAvT3ZkeitSQzRoV1RhZ1p0cVluV0pBVWdscEJMd3pHZU1tT1I4UzlC?= =?utf-8?B?THZqall6UzFqVUxoT1o4QU5Yek1yZ2lRejhVQVBDU1hITnVoWWFIT1lEU3g1?= =?utf-8?B?OU9HQzdMeDRiam9lUDdRRm5BQUpQY3Vja0JFNkZyQ00zVkNBcDZBVkIrWG9F?= =?utf-8?B?SXBUaEp3WlA4djYvbmpLWUx1Y21uSDhRMmhRNkMxNFhoZ01SamluTHljSDJK?= =?utf-8?B?TVp1OXA2Q1dnUks0ejZkbkl4ZTJlUkoxTjR0MCsrMjN2RjFxa2hhSGFEQkFw?= =?utf-8?B?MENZWldLajVINHZJMHowV3JDR1UxeVc1em1nK1ZvK1J0K2Y2OFJOUWJ4NHRx?= =?utf-8?B?dGIxem4wK3IxdHRlZ2owaXN5MUlqODhwYnp3L0JuQ2RFa1N2WXNydUxoRTZV?= =?utf-8?B?VGN4NXVLYkl6UStkRlZDR29UNHAzMWNiNEo2Z1l5YzhaV21LWmlQc0toeU5M?= =?utf-8?B?R2hjaWNoK052OTRCeml3SWd0UEZqY0ZxMll3dGdmTWlUOFYzWGJqNlJMeFRW?= =?utf-8?B?Yys1OGJlQkxveWk3VGVnTGNhb01VazRUS1R2MXI3OGlhODdBOVJSTDE3VFFo?= =?utf-8?B?NjJ3cVc4bWJVOVhXOHQvbDJkc2oxakxWTkRBYXVlb3NwUEdYVzBkR3hucVlM?= =?utf-8?B?WmZkQ3paRlVUNWlHV3ZWSEJaZFV0MHlBSUJWRmNPbWdEclpvZFF2TGdFWWFu?= =?utf-8?B?bHJGYjRZcTR6aTVIVktTbkNFVDFLeWlHVkdPYTFwRWtPeWp2SllpWGJML293?= =?utf-8?B?RkM4TG55WEJnNTcyVzR2WDFVSmZpNHIrZ0tMMUxuOFJtamp2S29pVm1UaGM0?= =?utf-8?B?UmdvTll3UCtHKzlTY0crMDdKbWlXS3dsK1FDR3pCK0MyZFJkckFNRm5Oandj?= =?utf-8?B?VXIrdnFHNG9hazZZR09PdWZaeWtQTFNBN2FYWGE2N0w2QkZPdWh5Q3c5bFJq?= =?utf-8?B?bklLYUYrZDBnPT0=?= 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)(82310400026)(36860700013)(1800799024)(7053199007);DIR:OUT;SFP:1102; X-OriginatorOrg: shymega.org.uk X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Feb 2025 19:53:34.2584 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8c62deb3-8960-46d1-ac30-08dd49436fc3 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: LO1PEPF000022FF.GBRP265.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LO6P265MB6441 Message-ID-Hash: RC4O275MBHZBOKEPC4YHFSUKM677DCDP X-Message-ID-Hash: RC4O275MBHZBOKEPC4YHFSUKM677DCDP 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: On 08.02.2025 14:36, 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 > > # Some packages can't (currently?) be built statically. Alyssa, are we aiming for a alphabetically-sorted list of packages in this file, or is it good as-is? > >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 @@ >+ >+ >+ Alyssa - is CC0-1.0 OK here, or would you prefer something else? >+ >+ >+ >+ monospace >+ >+ DejaVu Sans Mono >+ >+ >+ >+ >+ sans-serif >+ >+ DejaVu Sans >+ >+ >+ >+ /usr/share/fonts >+ >-- >2.47.2 > The only thing I'd like to see would be the description in the commit message, not in the email annotation - this would need to be a v3 patch, but when I apply this patch, I can't see the description in the tree, so it's hard to understand the reason for the commit. Other than that, thank you for your contribution - just need to fix the commit, and then check with Alyssa about list sorting and the license. Best wishes, -- Dom Rodriguez