fonts: support fallback fonts #201

jalil-salame · 2023-12-19T22:02:27Z

Alternative to #198 . It is a big breaking change to the config. If you set the fonts you now need to add []. For example:

serif = {
  package = pkgs.dejavu_fonts;
  name = "DejaVu Serif";
};

Becomes:

#       v--- IMPORTANT!
serif = [{
  package = pkgs.dejavu_fonts;
  name = "DejaVu Serif";
}];
#^-- IMPORTANT!

jalil-salame · 2023-12-20T14:00:46Z

I'm getting build issues when using this branch 🥲

I'll look over the diff to try and debug it.

This is the build log: https://github.com/jalil-salame/NixOsConfig/actions/runs/7276308829

modules/i3/hm.nix

jalil-salame

I think I found the issue

stylix/darwin/fonts.nix

stylix/fonts.nix

stylix/hm/fonts.nix

stylix/nixos/fonts.nix

jalil-salame · 2023-12-20T16:59:58Z

I think I found the issue

I didn't :c

It still fails: https://github.com/jalil-salame/NixOsConfig/actions/runs/7278474766

If you manage to catch something I missed then please tell me.

danth

Not sure why this is failing - from the error message my best guess would be that we are using package somewhere where we should be using { name, package }.

stylix/helper.nix

stylix/fonts.nix

jalil-salame · 2023-12-23T13:03:05Z

Not sure why this is failing - from the error message my best guess would be that we are using package somewhere where we should be using { name, package }.

I will grep for this case again as soon as I have time.

jalil-salame · 2023-12-23T19:48:49Z

Not sure why this is failing - from the error message my best guess would be that we are using package somewhere where we should be using { name, package }.

I will grep for this case again as soon as I have time.

I'm confused; I couldn't find this case anywhere but changing the functions to catAttrs fixed the build issues...

danth · 2024-01-03T20:01:15Z

Strange, I wonder if the issue is actually fixed or if catAttrs just filtered it out.

Collect each attribute named attr from a list of attribute sets. Sets that don't contain the named attribute are ignored.

stylix/fonts.nix

trueNAHO · 2024-01-12T14:13:33Z

fontconfig: add defaultFonts.* options nix-community/home-manager#2732

jalil-salame · 2024-01-14T14:02:11Z

Job failure is unrelated to my changes, it probably needs to be rerun

danth · 2024-01-14T19:07:17Z

Should be re-running now.

jalil-salame · 2024-01-14T20:17:09Z

It passed 🎉 this PR is now ready to be merged c:

jalil-salame · 2024-01-17T21:40:58Z

Rebased on top of master and addressed conflicts so it can be merged. Is anything blocking this? I don't want to keep going back and fixing small conflicts on this PR.

trueNAHO · 2024-02-09T22:21:14Z

The following patch applies this PR on my Home Manager configuration:

From 5f88a66d30bf014109ce8a41350447621d100515 Mon Sep 17 00:00:00 2001
From: NAHO <[email protected]>
Date: Fri, 9 Feb 2024 23:04:41 +0100
Subject: [PATCH] feat(modules/stylix): support fallback fonts

---
 flake.lock                 | 11 ++++-----
 flake.nix                  |  2 +-
 modules/stylix/default.nix | 46 ++++++++++++++++++++++----------------
 3 files changed, 34 insertions(+), 25 deletions(-)

diff --git a/flake.lock b/flake.lock
index 8b35089..f58efc3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -555,15 +555,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1707414210,
-        "narHash": "sha256-MJ4deL9tTzowkGpW9Iq+k3cSKo2gnvyIkIuFctNz/dQ=",
-        "owner": "danth",
+        "lastModified": 1707499046,
+        "narHash": "sha256-KTAvqoFbvUmzfPgN3vxlr8FABlbJ9gbwRTYtSQ3HfWw=",
+        "owner": "jalil-salame",
         "repo": "stylix",
-        "rev": "f3b302dd9bb66fcdd1ed3f185068a5f1000eb863",
+        "rev": "20e410269dc0432e6884a1a31403951abf6c155f",
         "type": "github"
       },
       "original": {
-        "owner": "danth",
+        "owner": "jalil-salame",
+        "ref": "fallback-fonts-v2",
         "repo": "stylix",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 97da286..a1c6fa2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -73,7 +73,7 @@
         nixpkgs.follows = "nixpkgs";
       };

-      url = "github:danth/stylix";
+      url = "github:jalil-salame/stylix/fallback-fonts-v2";
     };

     # Add the 'systems' input for consistent versioning across inputs.
diff --git a/modules/stylix/default.nix b/modules/stylix/default.nix
index a758aa5..1365865 100644
--- a/modules/stylix/default.nix
+++ b/modules/stylix/default.nix
@@ -17,25 +17,33 @@
       };

       fonts = {
-        emoji = {
-          package = pkgs.noto-fonts-emoji;
-          name = "Noto Color Emoji";
-        };
-
-        monospace = {
-          package = pkgs.nerdfonts.override {fonts = ["FiraCode"];};
-          name = "FiraCodeNerdFont";
-        };
-
-        sansSerif = {
-          package = pkgs.ibm-plex;
-          name = "IBMPlexSans";
-        };
-
-        serif = {
-          package = pkgs.crimson;
-          name = "Crimson";
-        };
+        emoji = [
+          {
+            package = pkgs.noto-fonts-emoji;
+            name = "Noto Color Emoji";
+          }
+        ];
+
+        monospace = [
+          {
+            package = pkgs.nerdfonts.override {fonts = ["FiraCode"];};
+            name = "FiraCodeNerdFont";
+          }
+        ];
+
+        sansSerif = [
+          {
+            package = pkgs.ibm-plex;
+            name = "IBMPlexSans";
+          }
+        ];
+
+        serif = [
+          {
+            package = pkgs.crimson;
+            name = "Crimson";
+          }
+        ];

         sizes = {
           terminal = 7;
--
2.43.0

Unfortunately, I encounter the following build error:

$ home-manager switch --flake <FLAKE>
error:
       … while calling the 'derivationStrict' builtin

         at /builtin/derivation.nix:9:12: (source not available)

       … while evaluating derivation 'home-manager-generation'
         whose name attribute is located at /nix/store/5gc4ncnkzcgma8fl1qabm8v9kj7w68gl-source/pkgs/stdenv/generic/make-derivation.nix:352:7

       … while evaluating attribute 'buildCommand' of derivation 'home-manager-generation'

         at /nix/store/5gc4ncnkzcgma8fl1qabm8v9kj7w68gl-source/pkgs/build-support/trivial-builders/default.nix:98:16:

           97|         enableParallelBuilding = true;
           98|         inherit buildCommand name;
             |                ^
           99|         passAsFile = [ "buildCommand" ]

       (stack trace truncated; use '--show-trace' to show the full trace)

       error: infinite recursion encountered

       at «none»:0: (source not available)

For reference, the following follow-up patch still causes the infinite recursion encountered error:

From a82f82470a83a7ea08c514d3f02ec8f0db10d15d Mon Sep 17 00:00:00 2001
From: NAHO <[email protected]>
Date: Fri, 9 Feb 2024 23:18:34 +0100
Subject: [PATCH] feat(modules/stylix): set 'monospace' font to default

---
 modules/stylix/default.nix | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/modules/stylix/default.nix b/modules/stylix/default.nix
index 1365865..7325a01 100644
--- a/modules/stylix/default.nix
+++ b/modules/stylix/default.nix
@@ -24,13 +24,6 @@
           }
         ];

-        monospace = [
-          {
-            package = pkgs.nerdfonts.override {fonts = ["FiraCode"];};
-            name = "FiraCodeNerdFont";
-          }
-        ];
-
         sansSerif = [
           {
             package = pkgs.ibm-plex;
--
2.43.0

trueNAHO · 2024-03-18T09:26:08Z

Am I improperly applying your patch, or is there a bug?

There probably is a bug. Thanks for noticing.

So far what I can tell is that dunst(?) is accessing the fonts before they are fully evaluated, but I need to look more into it before I come to a conclusion and can push a fix.

Mark the PR as ready once it's intended for review.

jalil-salame · 2024-03-18T11:53:05Z

Am I improperly applying your patch, or is there a bug?

There probably is a bug. Thanks for noticing.

So far what I can tell is that dunst(?) is accessing the fonts before they are fully evaluated, but I need to look more into it before I come to a conclusion and can push a fix.

Mark the PR as ready once it's intended for review.

Sorry about that, I haven't had time to fix this. It broke locally so I had to rebase it, but I don't have time to look into the issue...

jalil-salame · 2024-05-05T11:56:17Z

I can't figure out what is causing the infinite recursion in @trueNAHO 's case. I'll try removing the coercing code and checking again.

This should hopefilly fix the infinite recursion errors in danth#201 (comment)

jalil-salame · 2024-05-05T12:01:43Z

Removing the coercion to a list did not work T-T.

jalil-salame · 2024-05-05T12:17:11Z

I don't know what is going on with the infinite recursion, it was not the coercing code, so it probably has to do with builtins.head being eager while we need some construct like lib.mkIf instead. I don't know how to build such a construct though, so I give up. Feel free to take over or close this.

trueNAHO · 2024-05-05T14:31:27Z

I can't figure out what is causing the infinite recursion in @trueNAHO 's case. I'll try removing the coercing code and checking again.

Do you not encounter a infinite recursion encountered error?

jalil-salame · 2024-05-05T15:04:50Z

I can't figure out what is causing the infinite recursion in @trueNAHO 's case. I'll try removing the coercing code and checking again.

Do you not encounter a infinite recursion encountered error?

I do encounter it, I just could not find the cause. I tried turning off different parts of the config, but nothing worked.

trueNAHO · 2024-05-05T14:50:52Z

modules/bemenu/hm.nix

-    programs.bemenu.settings = with config.stylix.targets.bemenu; {
-      tb = "${base01}${bemenuOpacity}"; # Title bg
-      nb = "${base01}${bemenuOpacity}"; # Normal bg
-      fb = "${base01}${bemenuOpacity}"; # Filter bg
-      hb = "${base03}${bemenuOpacity}"; # Highlighted bg
-      sb = "${base03}${bemenuOpacity}"; # Selected bg
-      scb = "${base01}"; # Scrollbar bg
-
-      hf = "${base0A}"; # Highlighted fg
-      sf = "${base0B}"; # Selected fg
-      tf = "${base05}"; # Title fg
-      ff = "${base05}"; # Filter fg
-      nf = "${base05}"; # Normal fg
-      scf = "${base03}"; # Scrollbar fg
-
-      ab = "${if alternate then base00 else base01}"; # Alternate bg
-      af = "${if alternate then base04 else base05}"; # Alternate fg
-
-      # Font name
-      fn = "${sansSerif.name} ${lib.optionalString (fontSize != null) (builtins.toString fontSize)}";
-    };
+    home.sessionVariables.BEMENU_OPTS = with config.stylix.targets.bemenu; builtins.concatStringsSep " " [
+      # Inspired from https://git.sr.ht/~h4n1/base16-bemenu_opts
+      "--tb '${base01}${bemenuOpacity}'"
+      "--nb '${base01}${bemenuOpacity}'"
+      "--fb '${base01}${bemenuOpacity}'"
+      "--hb '${base03}${bemenuOpacity}'"
+      "--sb '${base03}${bemenuOpacity}'"
+      "--hf '${base0A}'"
+      "--sf '${base0B}'"
+      "--tf '${base05}'"
+      "--ff '${base05}'"
+      "--nf '${base05}'"
+      "--scb '${base01}'"
+      "--scf '${base03}'"
+      "--ab '${if alternate then base00 else base01}'"
+      "--af '${if alternate then base04 else base05}'"
+      "--fn '${sansSerif.name} ${lib.optionalString (fontSize != null) (builtins.toString fontSize)}'"
+    ];


Could you explain why the previous programs.bemenu.settings implementation was replaced?

Probably a mistake I made while fixing merge conflicts

trueNAHO · 2024-05-05T14:55:30Z

docs/src/configuration.md

  stylix.fonts = {
-    serif = {
+    serif = [{
      package = pkgs.dejavu_fonts;
      name = "DejaVu Serif";
-    };
+    }];

-    sansSerif = {
+    sansSerif = [{
      package = pkgs.dejavu_fonts;
      name = "DejaVu Sans";
-    };
+    }];

-    monospace = {
+    monospace = [{
      package = pkgs.dejavu_fonts;
      name = "DejaVu Sans Mono";
-    };
+    }];

-    emoji = {
+    emoji = [{
      package = pkgs.noto-fonts-emoji;
      name = "Noto Color Emoji";
-    };
+    }];
  };


The following format would better highlight the list:

sytlix.fonts = { serif = [ { package = pkgs.dejavu_fonts; name = "DejaVu Serif"; } ]; sansSerif = [ { package = pkgs.dejavu_fonts; name = "DejaVu Sans"; } ]; monospace = [ { package = pkgs.dejavu_fonts; name = "DejaVu Sans Mono"; } ]; emoji = [ { package = pkgs.noto-fonts-emoji; name = "Noto Color Emoji"; } ]; };

trueNAHO · 2024-05-05T15:05:26Z

stylix/fonts.nix

+    nestedTypes.elemType = elemType;
+  });
+
+  fontList = coercedToNonEmptyListOf fontType;


I am still receiving an infinite recursion encountered error with this patch:

Suggested change

fontList = coercedToNonEmptyListOf fontType;

fontList = types.listOf fontType;

Any ideas what could the cause?

I think it is builtins.head being eager to evaluate

trueNAHO · 2024-05-05T15:12:47Z

Do you not encounter a infinite recursion encountered error?

I do encounter it, I just could not find the cause. I tried turning off different parts of the config, but nothing worked.

Simplifying the PR with #201 (comment) does not resolve the issue. This seems to be a rather nasty infinite recursion encountered error...

However, the PR itself seems fine. I assume the problem stems from something seemingly unrelated within Stylix.

trueNAHO · 2024-05-05T15:39:34Z

Would it not be better to supersede this PR with the one mentioned in #216 (comment)? Although that PR would need to be superseded as well to resolve the pending suggestions (and attract new attention).

jalil-salame · 2024-05-05T16:31:41Z

Would it not be better to supersede this PR with the one mentioned in #216 (comment)? Although that PR would need to be superseded as well to resolve the pending suggestions (and attract new attention).

Ideally yes, but it has been open for ~2 years now

trueNAHO · 2024-05-12T12:00:30Z

Would it not be better to supersede this PR with the one mentioned in #216 (comment)? Although that PR would need to be superseded as well to resolve the pending suggestions (and attract new attention).

Ideally yes, but it has been open for ~2 years now

nix-community/home-manager#2732 has been merged.

jalil-salame · 2024-05-12T13:42:31Z

Would it not be better to supersede this PR with the one mentioned in #216 (comment)? Although that PR would need to be superseded as well to resolve the pending suggestions (and attract new attention).

Ideally yes, but it has been open for ~2 years now

🎉 great work! Thanks! Feel free to close this PR then!

trueNAHO · 2024-05-13T07:44:18Z

🎉 great work! Thanks! Feel free to close this PR then!

Does nix-community/home-manager#2732 cover what you wanted to do with this PR?

jalil-salame · 2024-05-13T09:58:01Z

Not really, what I'd want is to pull the defaultFonts.* and get my apps to follow it (specifically Wezterm). But this can be done using a different PR

trueNAHO · 2024-05-13T12:29:58Z

Not really, what I'd want is to pull the defaultFonts.* and get my apps to follow it (specifically Wezterm). But this can be done using a different PR

Depending on the discussion in #366, we might still need this PR.

Some programs use them (notably wezterm which is why I made this PR) and they are a nice way to add nerdfont symbols without patching fonts.

This modifies the modules to add support for fallback fonts. Some of them just use the default fonts (the first font in the list), some also respect the fallback.

jalil-salame force-pushed the fallback-fonts-v2 branch from b8f7664 to 8931886 Compare December 20, 2023 11:27

jalil-salame commented Dec 20, 2023

View reviewed changes

modules/i3/hm.nix Outdated Show resolved Hide resolved

jalil-salame commented Dec 20, 2023

View reviewed changes

stylix/darwin/fonts.nix Outdated Show resolved Hide resolved

stylix/fonts.nix Show resolved Hide resolved

stylix/hm/fonts.nix Outdated Show resolved Hide resolved

stylix/nixos/fonts.nix Outdated Show resolved Hide resolved

jalil-salame marked this pull request as draft December 20, 2023 17:14

jalil-salame mentioned this pull request Dec 20, 2023

fonts: support fallback fonts #198

Closed

danth reviewed Dec 23, 2023

View reviewed changes

stylix/helper.nix Outdated Show resolved Hide resolved

stylix/fonts.nix Show resolved Hide resolved

jalil-salame marked this pull request as ready for review December 23, 2023 20:14

jalil-salame requested a review from danth December 30, 2023 22:38

jalil-salame force-pushed the fallback-fonts-v2 branch from ed9da77 to 135d4a0 Compare December 31, 2023 11:45

danth requested changes Jan 3, 2024

View reviewed changes

stylix/fonts.nix Outdated Show resolved Hide resolved

jalil-salame requested a review from danth January 14, 2024 13:54

jalil-salame force-pushed the fallback-fonts-v2 branch from ff25737 to 9c6809b Compare January 17, 2024 21:32

jalil-salame force-pushed the fallback-fonts-v2 branch 2 times, most recently from 025e1da to 2ec5b63 Compare January 27, 2024 14:37

jalil-salame force-pushed the fallback-fonts-v2 branch 2 times, most recently from a492a0a to 8059347 Compare February 8, 2024 07:03

jalil-salame mentioned this pull request Feb 8, 2024

Reduce duplication in stylix #245

Merged

jalil-salame force-pushed the fallback-fonts-v2 branch from 8059347 to 20e4102 Compare February 9, 2024 17:17

trueNAHO changed the title ~~feat(fonts): Add support for fallback fonts (v2)~~ fonts: support fallback fonts (v2) Feb 9, 2024

trueNAHO marked this pull request as draft March 18, 2024 09:23

jalil-salame force-pushed the fallback-fonts-v2 branch from 4578645 to 6205617 Compare March 29, 2024 12:27

jalil-salame force-pushed the fallback-fonts-v2 branch 2 times, most recently from 2f2be91 to 00b32e1 Compare April 22, 2024 14:35

jalil-salame force-pushed the fallback-fonts-v2 branch 2 times, most recently from da4c299 to 26fd862 Compare May 5, 2024 11:35

jalil-salame added a commit to jalil-salame/stylix that referenced this pull request May 5, 2024

stylix: remove coercing of fonts

08d5c57

This should hopefilly fix the infinite recursion errors in danth#201 (comment)

jalil-salame marked this pull request as ready for review May 5, 2024 12:17

jalil-salame mentioned this pull request May 5, 2024

treewide: add stylix.enable option #244

Merged

6 tasks

trueNAHO reviewed May 5, 2024

View reviewed changes

trueNAHO mentioned this pull request May 13, 2024

stylix: delegate default font declarations #366

Open

jalil-salame added 2 commits May 26, 2024 16:06

stylix: add support for fallback fonts

c9c6134

Some programs use them (notably wezterm which is why I made this PR) and they are a nice way to add nerdfont symbols without patching fonts.

treewide: add support for fallback fonts

9503b1e

This modifies the modules to add support for fallback fonts. Some of them just use the default fonts (the first font in the list), some also respect the fallback.

jalil-salame force-pushed the fallback-fonts-v2 branch from 26fd862 to 9503b1e Compare May 26, 2024 14:06

trueNAHO mentioned this pull request Jun 23, 2024

nixOS KDE plasma stylix breaks emojis in notifications #448

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fonts: support fallback fonts #201

fonts: support fallback fonts #201

jalil-salame commented Dec 19, 2023

jalil-salame commented Dec 20, 2023

jalil-salame left a comment

jalil-salame commented Dec 20, 2023 •

edited

Loading

danth left a comment

jalil-salame commented Dec 23, 2023

jalil-salame commented Dec 23, 2023

danth commented Jan 3, 2024

trueNAHO commented Jan 12, 2024

jalil-salame commented Jan 14, 2024

danth commented Jan 14, 2024

jalil-salame commented Jan 14, 2024

jalil-salame commented Jan 17, 2024

trueNAHO commented Feb 9, 2024 •

edited

Loading

trueNAHO commented Mar 18, 2024

jalil-salame commented Mar 18, 2024

jalil-salame commented May 5, 2024

jalil-salame commented May 5, 2024

jalil-salame commented May 5, 2024

trueNAHO commented May 5, 2024

jalil-salame commented May 5, 2024

trueNAHO May 5, 2024

jalil-salame May 5, 2024

trueNAHO May 5, 2024

trueNAHO May 5, 2024

jalil-salame May 5, 2024

trueNAHO commented May 5, 2024

trueNAHO commented May 5, 2024

jalil-salame commented May 5, 2024 •

edited

Loading

trueNAHO commented May 12, 2024

jalil-salame commented May 12, 2024 •

edited

Loading

trueNAHO commented May 13, 2024

jalil-salame commented May 13, 2024

trueNAHO commented May 13, 2024

	fontList = coercedToNonEmptyListOf fontType;
	fontList = types.listOf fontType;

fonts: support fallback fonts #201

Are you sure you want to change the base?

fonts: support fallback fonts #201

Conversation

jalil-salame commented Dec 19, 2023

jalil-salame commented Dec 20, 2023

jalil-salame left a comment

Choose a reason for hiding this comment

jalil-salame commented Dec 20, 2023 • edited Loading

danth left a comment

Choose a reason for hiding this comment

jalil-salame commented Dec 23, 2023

jalil-salame commented Dec 23, 2023

danth commented Jan 3, 2024

trueNAHO commented Jan 12, 2024

jalil-salame commented Jan 14, 2024

danth commented Jan 14, 2024

jalil-salame commented Jan 14, 2024

jalil-salame commented Jan 17, 2024

trueNAHO commented Feb 9, 2024 • edited Loading

trueNAHO commented Mar 18, 2024

jalil-salame commented Mar 18, 2024

jalil-salame commented May 5, 2024

jalil-salame commented May 5, 2024

jalil-salame commented May 5, 2024

trueNAHO commented May 5, 2024

jalil-salame commented May 5, 2024

trueNAHO May 5, 2024

Choose a reason for hiding this comment

jalil-salame May 5, 2024

Choose a reason for hiding this comment

trueNAHO May 5, 2024

Choose a reason for hiding this comment

trueNAHO May 5, 2024

Choose a reason for hiding this comment

jalil-salame May 5, 2024

Choose a reason for hiding this comment

trueNAHO commented May 5, 2024

trueNAHO commented May 5, 2024

jalil-salame commented May 5, 2024 • edited Loading

trueNAHO commented May 12, 2024

jalil-salame commented May 12, 2024 • edited Loading

trueNAHO commented May 13, 2024

jalil-salame commented May 13, 2024

trueNAHO commented May 13, 2024

jalil-salame commented Dec 20, 2023 •

edited

Loading

trueNAHO commented Feb 9, 2024 •

edited

Loading

jalil-salame commented May 5, 2024 •

edited

Loading

jalil-salame commented May 12, 2024 •

edited

Loading