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 0AFFD16AA3; Thu, 20 Feb 2025 09:45:03 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id B04D010D47; Sat, 15 Feb 2025 22:23:36 +0000 (UTC) Received: from localhost by atuin.qyliss.net with SpamAssassin (version 4.0.1); Sat, 15 Feb 2025 22:23:36 +0000 From: Samy Lahfa To: devel@spectrum-os.org Subject: [PATCH v3] img/app: add dejavu_fonts pkg and fontconfig file Date: Sat, 15 Feb 2025 23:22:51 +0100 Message-Id: <20250215222254.2950904-1-samy+spectrum@lahfa.xyz> X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on atuin.qyliss.net X-Spam-Flag: YES X-Spam-Level: ***** X-Spam-Status: Yes, score=5.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DMARC_PASS,FROM_SUSPICIOUS_NTLD,FROM_SUSPICIOUS_NTLD_FP, PDS_OTHER_BAD_TLD,RDNS_NONE,SPF_HELO_NONE autolearn=no autolearn_force=no version=4.0.1 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----------=_67B113E8.F9F29BD3" X-MailFrom: samy+spectrum@lahfa.xyz X-Mailman-Rule-Hits: header-match-devel.spectrum-os.org-4 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 Message-ID-Hash: EFKPNBIT5DSHQ6WOHIEMNRW2NEWZ6FMB X-Message-ID-Hash: EFKPNBIT5DSHQ6WOHIEMNRW2NEWZ6FMB X-Mailman-Approved-At: Thu, 20 Feb 2025 09:45:00 +0000 CC: shymega@shymega.org.uk, 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: This is a multi-part message in MIME format. ------------=_67B113E8.F9F29BD3 Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit Spam detection software, running on the system "atuin.qyliss.net", has identified this incoming email as possible spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: 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/de [...] Content analysis details: (5.7 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: lahfa.xyz (xyz)] 2.0 FROM_SUSPICIOUS_NTLD_FP From abused NTLD 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD 1.3 RDNS_NONE Delivered to internal network by a host with no rDNS -0.0 DMARC_PASS DMARC pass policy ------------=_67B113E8.F9F29BD3 Content-Type: message/rfc822; x-spam-type=original Content-Description: original message before SpamAssassin Content-Disposition: inline Content-Transfer-Encoding: 8bit Received: from kurisu.lahfa.xyz (unknown [IPv6:2001:bc8:38ee::1]) by atuin.qyliss.net (Postfix) with ESMTPS id 2D3B510CDA for ; Sat, 15 Feb 2025 22:23:32 +0000 (UTC) From: Samy Lahfa DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lahfa.xyz; s=kurisu; t=1739658208; bh=YSDsmdum8A6ZDSzlSwuJt0roorstSHi1RlgBUa92Mgw=; h=From:To:Cc:Subject:Date; b=ojChmtK1qLe1b7xM99OYN66zqokTS4ZBazkSSA00TbpNyfw8HQwuSLt+3lJe3vIAc 7FimsUV+uR8Y+3bhXceI/Oq4mZJkdQ2/xWy2QByLhxTyXKr1K6/X2MWBXfYjAREx08 tYFzBcSljx2fTdCdxrOpjt5lnFwUsr7nhJ4jrje4= To: devel@spectrum-os.org Cc: shymega@shymega.org.uk, Samy Lahfa Subject: [PATCH v3] img/app: add dejavu_fonts pkg and fontconfig file Date: Sat, 15 Feb 2025 23:22:51 +0100 Message-ID: <20250215222254.2950904-1-samy+spectrum@lahfa.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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. 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 ------------=_67B113E8.F9F29BD3--