[PATCH] fix(foot-vm): add dejavu_fonts and fontconfig

[PATCH] fix(foot-vm): add dejavu_fonts and fontconfig

[Samy Lahfa]

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

Re: [PATCH] fix(foot-vm): add dejavu_fonts and fontconfig

[Dom (shymega) Rodriguez]

On 28.01.2025 23:22, Samy Lahfa wrote:
>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
>

Could you edit the commit message and resubmit your patch to be a little
more descriptive, as well as the justification for the change?

I can't see any prior discussion on the list for historical info for
this change, and I'm not clear as to the rationale of it.

A v2 of the patch would be grand.

Thanks.

Best wishes,
--
Dom Rodriguez

Re: [PATCH] fix(foot-vm): add dejavu_fonts and fontconfig

[Alyssa Ross]

[-- Attachment #1: Type: text/plain, Size: 2919 bytes --]

Samy Lahfa <samy+spectrum@lahfa.xyz> writes:

> Signed-off-by: Samy Lahfa <samy+spectrum@lahfa.xyz>

Great, thanks for fixing this!  As Dom says, it would be nice to have
more explanation in the patch description for what the purpose of this
change is, and please have a look at other Spectrum commit messages to
see how the subject line should be formatted — it should start with
"img/app:", and it might be nicer to emphasize what it fixes rather than
the underlying change being made.

Some more feedback inline below.

> ---
>  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

Please keep this list sorted.

>  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

Can you take this as a callPackage input and refer to it without "pkgs."
please, like the other packages above it?

(Arguably, there's probably no point having anything coming from
pkgsStatic any more in this image, since there's so much non-static
stuff now, but for now let's stick with it to at least stay consistent.)

>        # 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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]