* [PATCH v2] img/app: add dejavu_fonts pkg and fontconfig file @ 2025-02-08 13:36 Samy Lahfa 2025-02-09 19:49 ` Dom (shymega) Rodriguez 0 siblings, 1 reply; 6+ messages in thread From: Samy Lahfa @ 2025-02-08 13:36 UTC (permalink / raw) To: devel; +Cc: shymega, Samy Lahfa Signed-off-by: Samy Lahfa <samy+spectrum@lahfa.xyz> --- 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 @@ +<?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 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2] img/app: add dejavu_fonts pkg and fontconfig file 2025-02-08 13:36 [PATCH v2] img/app: add dejavu_fonts pkg and fontconfig file Samy Lahfa @ 2025-02-09 19:49 ` Dom (shymega) Rodriguez 2025-02-11 17:27 ` Alyssa Ross 0 siblings, 1 reply; 6+ messages in thread From: Dom (shymega) Rodriguez @ 2025-02-09 19:49 UTC (permalink / raw) To: Samy Lahfa; +Cc: devel On 08.02.2025 14:36, Samy Lahfa wrote: >Signed-off-by: Samy Lahfa <samy+spectrum@lahfa.xyz> >--- >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 @@ >+<?xml version="1.0" encoding="UTF-8"?> >+<!-- SPDX-License-Identifier: CC0-1.0 --> >+<!-- SPDX-FileCopyrightText: 2021 Alyssa Ross <hi@alyssa.is> --> Alyssa - is CC0-1.0 OK here, or would you prefer something else? >+<!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 > 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 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] img/app: add dejavu_fonts pkg and fontconfig file 2025-02-09 19:49 ` Dom (shymega) Rodriguez @ 2025-02-11 17:27 ` Alyssa Ross 2025-02-12 19:53 ` Dom (shymega) Rodriguez 0 siblings, 1 reply; 6+ messages in thread From: Alyssa Ross @ 2025-02-11 17:27 UTC (permalink / raw) To: Dom (shymega) Rodriguez, Samy Lahfa; +Cc: devel [-- Attachment #1: Type: text/plain, Size: 4292 bytes --] "Dom (shymega) Rodriguez" <shymega@shymega.org.uk> writes: > On 08.02.2025 14:36, Samy Lahfa wrote: >>Signed-off-by: Samy Lahfa <samy+spectrum@lahfa.xyz> >>--- >>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? Basically any time a list is alphabetically sorted, it should be kept alphabetically sorted. >> >>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> --> > > Alyssa - is CC0-1.0 OK here, or would you prefer something else? Yeah — this is actually a copy of an existing file in the tree, host/rootfs/etc/fonts/fonts.conf, so keeping the copyright and license information the same was the right thing to do. >>+<!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 >> > > 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. Yeah, to clarify this: when "git am" applies a patch, everything after the "---" is discarded, so stuff that's intended for the commit message should go before that. It's sometimes useful to put extra information that doesn't need to make it into git after the "---", but most of the explanation of the change should go before. Samy, both of the remaining issues here (the list sorting, and the patch description) are pretty trivial — you can send a v3 if you'd like, but I'm also just happy to just apply this patch and fix it up as I do so. What would you prefer? Thanks! [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 227 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] img/app: add dejavu_fonts pkg and fontconfig file 2025-02-11 17:27 ` Alyssa Ross @ 2025-02-12 19:53 ` Dom (shymega) Rodriguez 2025-02-14 8:48 ` Alyssa Ross 0 siblings, 1 reply; 6+ messages in thread From: Dom (shymega) Rodriguez @ 2025-02-12 19:53 UTC (permalink / raw) To: Alyssa Ross; +Cc: Samy Lahfa, devel On 11.02.2025 18:27, Alyssa Ross wrote: >"Dom (shymega) Rodriguez" <shymega@shymega.org.uk> writes: > >> On 08.02.2025 14:36, Samy Lahfa wrote: >>>Signed-off-by: Samy Lahfa <samy+spectrum@lahfa.xyz> >>>--- >>>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? > >Basically any time a list is alphabetically sorted, it should be kept >alphabetically sorted. Understood. Do we have this in a 'contributing guidelines' document? > >>> >>>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> --> >> >> Alyssa - is CC0-1.0 OK here, or would you prefer something else? > >Yeah — this is actually a copy of an existing file in the tree, >host/rootfs/etc/fonts/fonts.conf, so keeping the copyright and license >information the same was the right thing to do. ack. > >>>+<!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 >>> >> >> 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. > >Yeah, to clarify this: when "git am" applies a patch, everything after >the "---" is discarded, so stuff that's intended for the commit message >should go before that. It's sometimes useful to put extra information >that doesn't need to make it into git after the "---", but most of the >explanation of the change should go before. Sorry, should have clarified on my part. I was in 'technical mode'. >Samy, both of the remaining issues here (the list sorting, and the patch >description) are pretty trivial — you can send a v3 if you'd like, but >I'm also just happy to just apply this patch and fix it up as I do so. >What would you prefer? No objection from me on fixing up the patch on your side, Alyssa. I certainly don't want to make the barrier to entry for contributing higher. Best wishes, -- Dom Rodriguez ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] img/app: add dejavu_fonts pkg and fontconfig file 2025-02-12 19:53 ` Dom (shymega) Rodriguez @ 2025-02-14 8:48 ` Alyssa Ross 2025-02-20 0:32 ` Dom (shymega) Rodriguez 0 siblings, 1 reply; 6+ messages in thread From: Alyssa Ross @ 2025-02-14 8:48 UTC (permalink / raw) To: Dom (shymega) Rodriguez; +Cc: Samy Lahfa, devel [-- Attachment #1: Type: text/plain, Size: 889 bytes --] "Dom (shymega) Rodriguez" <shymega@shymega.org.uk> writes: > On 11.02.2025 18:27, Alyssa Ross wrote: >>"Dom (shymega) Rodriguez" <shymega@shymega.org.uk> writes: >> >>> On 08.02.2025 14:36, Samy Lahfa wrote: >>>>@@ -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? >> >>Basically any time a list is alphabetically sorted, it should be kept >>alphabetically sorted. > > Understood. Do we have this in a 'contributing guidelines' document? No, we don't. The contributing documentation is in a pretty bad state tbh, and I don't think there's anywhere obvious to put it. It's something I plan to put some serious work into this year. [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 227 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] img/app: add dejavu_fonts pkg and fontconfig file 2025-02-14 8:48 ` Alyssa Ross @ 2025-02-20 0:32 ` Dom (shymega) Rodriguez 0 siblings, 0 replies; 6+ messages in thread From: Dom (shymega) Rodriguez @ 2025-02-20 0:32 UTC (permalink / raw) To: Alyssa Ross; +Cc: Samy Lahfa, devel On 14.02.2025 09:48, Alyssa Ross wrote: >"Dom (shymega) Rodriguez" <shymega@shymega.org.uk> writes: > >> On 11.02.2025 18:27, Alyssa Ross wrote: >>>"Dom (shymega) Rodriguez" <shymega@shymega.org.uk> writes: >>> >>>> On 08.02.2025 14:36, Samy Lahfa wrote: >>>>>@@ -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? >>> >>>Basically any time a list is alphabetically sorted, it should be kept >>>alphabetically sorted. >> >> Understood. Do we have this in a 'contributing guidelines' document? > >No, we don't. The contributing documentation is in a pretty bad state >tbh, and I don't think there's anywhere obvious to put it. It's >something I plan to put some serious work into this year. I have some suggestions - let's discuss in Matrix sometime this week/weekend, or on the list. Best wishes, -- Dom Rodriguez ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2025-02-20 8:00 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2025-02-08 13:36 [PATCH v2] img/app: add dejavu_fonts pkg and fontconfig file Samy Lahfa 2025-02-09 19:49 ` Dom (shymega) Rodriguez 2025-02-11 17:27 ` Alyssa Ross 2025-02-12 19:53 ` Dom (shymega) Rodriguez 2025-02-14 8:48 ` Alyssa Ross 2025-02-20 0:32 ` Dom (shymega) Rodriguez
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).