fixup! feat(fonts): Add support for fallback fonts

danth · Dec 23, 2023 · ed9da77 · ed9da77
1 parent 78285f2
commit ed9da77
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 31 deletions.
diff --git a/modules/i3/hm.nix b/modules/i3/hm.nix
@@ -11,7 +11,7 @@ let
   fonts = let
     inherit (config.stylix) fonts;
   in {
-    names = builtins.map ({ name, ... }: name) fonts.sansSerif;
+    names = lib.catAttrs "name" fonts.sansSerif;
     size = fonts.sizes.desktop * 1.0;
   };
 

diff --git a/modules/sway/hm.nix b/modules/sway/hm.nix
@@ -12,7 +12,7 @@ let
     inherit (config.stylix) fonts;
     inherit (fonts) sizes;
   in {
-    names = builtins.map ({ name, ... }: name) fonts.sansSerif;
+    names = lib.catAttrs "name" fonts.sansSerif;
     size = sizes.desktop + 0.0;
   };
 

diff --git a/stylix/darwin/fonts.nix b/stylix/darwin/fonts.nix
@@ -1,16 +1,15 @@
-{ config, ... }:
+{ config, lib, ... }:
 
 let
   cfg = config.stylix.fonts;
-  inherit (../helper.nix) fontPackages;
 in {
   imports = [ ../fonts.nix ];
   config.fonts = {
     fontDir.enable = true;
 
-    fonts = (fontPackages cfg.monospace)
-      ++ (fontPackages cfg.serif)
-      ++ (fontPackages cfg.sansSerif)
-      ++ (fontPackages cfg.emoji);
+    fonts = (lib.catAttrs "package" cfg.monospace)
+      ++ (lib.catAttrs "package" cfg.serif)
+      ++ (lib.catAttrs "package" cfg.sansSerif)
+      ++ (lib.catAttrs "package" cfg.emoji);
   };
 }
diff --git a/stylix/helper.nix b/stylix/helper.nix
diff --git a/stylix/hm/fonts.nix b/stylix/hm/fonts.nix
@@ -1,15 +1,14 @@
-{ config, ... }:
+{ config, lib, ... }:
 
 let
   cfg = config.stylix.fonts;
-  inherit (../helper.nix) fontPackages;
 in {
   imports = [ ../fonts.nix ];
   config = {
     fonts.fontconfig.enable = true;
-    home.packages = (fontPackages cfg.monospace)
-      ++ (fontPackages cfg.serif)
-      ++ (fontPackages cfg.sansSerif)
-      ++ (fontPackages cfg.emoji);
+    home.packages = (lib.catAttrs "package" cfg.monospace)
+      ++ (lib.catAttrs "package" cfg.serif)
+      ++ (lib.catAttrs "package" cfg.sansSerif)
+      ++ (lib.catAttrs "package" cfg.emoji);
   };
 }
diff --git a/stylix/nixos/fonts.nix b/stylix/nixos/fonts.nix
@@ -1,21 +1,20 @@
-{ config, ... }:
+{ config, lib, ... }:
 
 let
   cfg = config.stylix.fonts;
-  inherit (../helper.nix) fontPackages fontNames;
 in {
   imports = [ ../fonts.nix ];
   config.fonts = {
-    packages = (fontPackages cfg.monospace)
-      ++ (fontPackages cfg.serif)
-      ++ (fontPackages cfg.sansSerif)
-      ++ (fontPackages cfg.emoji);
+    packages = (lib.catAttrs "package" cfg.monospace)
+      ++ (lib.catAttrs "package" cfg.serif)
+      ++ (lib.catAttrs "package" cfg.sansSerif)
+      ++ (lib.catAttrs "package" cfg.emoji);
 
     fontconfig.defaultFonts = {
-      monospace = fontNames cfg.monospace;
-      serif = fontNames cfg.serif;
-      sansSerif = fontNames cfg.sansSerif;
-      emoji = fontNames cfg.emoji;
+      monospace = lib.catAttrs "name" cfg.monospace;
+      serif = lib.catAttrs "name" cfg.serif;
+      sansSerif = lib.catAttrs "name" cfg.sansSerif;
+      emoji = lib.catAttrs "name" cfg.emoji;
     };
   };
 }