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 B78271259E; Tue, 28 Jan 2025 22:23:18 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id AA41D12587; Tue, 28 Jan 2025 22:23:10 +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=2.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DMARC_PASS,FROM_SUSPICIOUS_NTLD,FROM_SUSPICIOUS_NTLD_FP, PDS_OTHER_BAD_TLD,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=4.0.1 Received: from kurisu.lahfa.xyz (kurisu.lahfa.xyz [163.172.69.160]) by atuin.qyliss.net (Postfix) with ESMTPS id C161E12585 for ; Tue, 28 Jan 2025 22:23:06 +0000 (UTC) From: Samy Lahfa DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lahfa.xyz; s=kurisu; t=1738102984; bh=QPPlhtqgBvhHNNsxLbNx0ju8zzLFWtrc97xVjZuNu/w=; h=From:To:Cc:Subject:Date; b=bpCMYwDf02WZcY8jOLZl4JJdmGpl+w4jY4juPwSfYGeuej6+lt3UPt8WnTEeaobFV Ztk4Jnub06siTG676v1/O0uyqDCfz4aZCfxG4R2qw0W45h2h2ZojlbBHJd3CpcE0tk mrUjs4qQjsCSmc619zmC1FEueQRGpd+JSPrrFgfk= To: devel@spectrum-os.org Subject: [PATCH] fix(foot-vm): add dejavu_fonts and fontconfig Date: Tue, 28 Jan 2025 23:22:41 +0100 Message-ID: <20250128222241.914713-1-samy+spectrum@lahfa.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: FILHWKFTCHRO74KFTROCH4DKP2XH4NOI X-Message-ID-Hash: FILHWKFTCHRO74KFTROCH4DKP2XH4NOI X-MailFrom: samy+spectrum@lahfa.xyz 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: Samy Lahfa 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: Signed-off-by: Samy Lahfa --- img/app/Makefile | 3 ++- img/app/default.nix | 1 + img/app/etc/fonts/fonts.conf | 21 +++++++++++++++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 img/app/etc/fonts/fonts.conf diff --git a/img/app/Makefile b/img/app/Makefile index 7887aa8..8bfb7a1 100644 --- a/img/app/Makefile +++ b/img/app/Makefile @@ -51,7 +51,8 @@ VM_FILES = \ etc/s6-linux-init/scripts/rc.init \ etc/s6-linux-init/scripts/rc.shutdown \ etc/s6-linux-init/scripts/rc.shutdown.final \ - etc/xdg/xdg-desktop-portal/portals.conf + etc/xdg/xdg-desktop-portal/portals.conf \ + etc/fonts/fonts.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..fc2af0e 100644 --- a/img/app/default.nix +++ b/img/app/default.nix @@ -37,6 +37,7 @@ let s6-rc terminfo xdg-desktop-portal-spectrum + pkgs.dejavu_fonts # 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