From b5b4208b30387767d31bb00796a24bd72cd303eb Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Thu, 15 Aug 2024 23:32:56 +0800 Subject: [PATCH] dust: add noto-fonts --- hosts/dust/default.nix | 64 ++++++++++++++++++++++++------------------ 1 file changed, 36 insertions(+), 28 deletions(-) diff --git a/hosts/dust/default.nix b/hosts/dust/default.nix index 7a876e6..acfed69 100644 --- a/hosts/dust/default.nix +++ b/hosts/dust/default.nix @@ -71,13 +71,6 @@ runHook postInstall ''; }) - (source-sans.overrideAttrs { - installPhase = '' - runHook preInstall - install -Dm444 VF/*.otf -t $out/share/fonts/variable - runHook postInstall - ''; - }) (source-serif.overrideAttrs { installPhase = '' runHook preInstall @@ -87,29 +80,44 @@ }) source-han-sans-vf-otf source-han-serif-vf-otf + noto-fonts noto-fonts-color-emoji ]; - fontconfig.defaultFonts = { - emoji = [ - "Noto Color Emoji" - ]; - # Append emoji font for Qt apps, they might use the monochrome emoji - monospace = [ - "JetBrains Mono" - "Source Han Sans SC VF" - "Symbols Nerd Font" - "Noto Color Emoji" - ]; - sansSerif = [ - "Inter Variable" - "Source Han Sans SC VF" - "Noto Color Emoji" - ]; - serif = [ - "Source Serif 4 Variable" - "Source Han Serif SC VF" - "Noto Color Emoji" - ]; + fontconfig = { + defaultFonts = { + emoji = [ + "Noto Color Emoji" + ]; + # Append emoji font for Qt apps, they might use the monochrome emoji + monospace = [ + "JetBrains Mono" + "Source Han Sans SC VF" + "Symbols Nerd Font" + "Noto Color Emoji" + ]; + sansSerif = [ + "Inter Variable" + "Source Han Sans SC VF" + "Noto Color Emoji" + ]; + serif = [ + "Source Serif 4 Variable" + "Source Han Serif SC VF" + "Noto Color Emoji" + ]; + }; + # GitHub perfers Noto Sans... + localConf = '' + + + + + Noto Sans + + + + + ''; }; };