From f2711be0a3038686bdbfff7cc0854418fa4f2551 Mon Sep 17 00:00:00 2001 From: "Shahar \"Dawn\" Or" Date: Fri, 18 Jul 2025 16:31:42 +0700 Subject: [PATCH] fontconfig: refactor using `lib.genAttrs` --- modules/fontconfig/fontconfig.nix | 14 +++++++------- modules/fontconfig/hm.nix | 2 +- modules/fontconfig/nixos.nix | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/fontconfig/fontconfig.nix b/modules/fontconfig/fontconfig.nix index ccabdf1a..eb43c8f4 100644 --- a/modules/fontconfig/fontconfig.nix +++ b/modules/fontconfig/fontconfig.nix @@ -1,4 +1,4 @@ -{ mkTarget }: +{ mkTarget, lib, ... }: mkTarget { name = "fontconfig"; humanName = "Fontconfig"; @@ -6,11 +6,11 @@ mkTarget { configElements = { fonts }: { - fonts.fontconfig.defaultFonts = { - monospace = [ fonts.monospace.name ]; - serif = [ fonts.serif.name ]; - sansSerif = [ fonts.sansSerif.name ]; - emoji = [ fonts.emoji.name ]; - }; + fonts.fontconfig.defaultFonts = lib.genAttrs [ + "monospace" + "serif" + "sansSerif" + "emoji" + ] (family: [ fonts.${family}.name ]); }; } diff --git a/modules/fontconfig/hm.nix b/modules/fontconfig/hm.nix index 9e14cdbc..69c11182 100644 --- a/modules/fontconfig/hm.nix +++ b/modules/fontconfig/hm.nix @@ -1,6 +1,6 @@ { lib, mkTarget, ... }: { imports = [ - (lib.modules.importApply ./fontconfig.nix { inherit mkTarget; }) + (lib.modules.importApply ./fontconfig.nix { inherit mkTarget lib; }) ]; } diff --git a/modules/fontconfig/nixos.nix b/modules/fontconfig/nixos.nix index 9e14cdbc..69c11182 100644 --- a/modules/fontconfig/nixos.nix +++ b/modules/fontconfig/nixos.nix @@ -1,6 +1,6 @@ { lib, mkTarget, ... }: { imports = [ - (lib.modules.importApply ./fontconfig.nix { inherit mkTarget; }) + (lib.modules.importApply ./fontconfig.nix { inherit mkTarget lib; }) ]; }