From: Samy Lahfa <samy+spectrum@lahfa.xyz>
To: devel@spectrum-os.org
Cc: Samy Lahfa <samy+spectrum@lahfa.xyz>
Subject: [PATCH] fix(foot-vm): add dejavu_fonts and fontconfig
Date: Tue, 28 Jan 2025 23:22:41 +0100 [thread overview]
Message-ID: <20250128222241.914713-1-samy+spectrum@lahfa.xyz> (raw)
Signed-off-by: Samy Lahfa <samy+spectrum@lahfa.xyz>
---
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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- SPDX-License-Identifier: CC0-1.0 -->
+<!-- SPDX-FileCopyrightText: 2021 Alyssa Ross <hi@alyssa.is> -->
+<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
+<fontconfig>
+ <alias binding="same">
+ <family>monospace</family>
+ <prefer>
+ <family>DejaVu Sans Mono</family>
+ </prefer>
+ </alias>
+
+ <alias binding="same">
+ <family>sans-serif</family>
+ <prefer>
+ <family>DejaVu Sans</family>
+ </prefer>
+ </alias>
+
+ <dir>/usr/share/fonts</dir>
+</fontconfig>
--
2.47.2
next reply other threads:[~2025-01-28 22:23 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-28 22:22 Samy Lahfa [this message]
2025-01-28 23:23 ` [PATCH] fix(foot-vm): add dejavu_fonts and fontconfig Dom (shymega) Rodriguez
2025-01-30 11:29 ` Alyssa Ross
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250128222241.914713-1-samy+spectrum@lahfa.xyz \
--to=samy+spectrum@lahfa.xyz \
--cc=devel@spectrum-os.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://spectrum-os.org/git/crosvm
https://spectrum-os.org/git/doc
https://spectrum-os.org/git/mktuntap
https://spectrum-os.org/git/nixpkgs
https://spectrum-os.org/git/spectrum
https://spectrum-os.org/git/ucspi-vsock
https://spectrum-os.org/git/www
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).