From c9180d8a1a40b80db32e9938ab49bbe38cd7723e Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Sun, 14 Jul 2024 03:01:04 +0800 Subject: [PATCH] home/fonts: perfer source-{sans,serif} over noto-{sans,serif} --- .../graphical/home/fonts/default.nix | 31 +++++++++++-------- .../aristotle/graphical/home/fonts/fonts.conf | 1 + 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/hosts/aristotle/graphical/home/fonts/default.nix b/hosts/aristotle/graphical/home/fonts/default.nix index 842279e..2c1dde1 100644 --- a/hosts/aristotle/graphical/home/fonts/default.nix +++ b/hosts/aristotle/graphical/home/fonts/default.nix @@ -36,19 +36,11 @@ }; # HM managed fonts - # - # The reason I use Source Han instead of Noto CJK, - # is because I heard from #archlinux-cn, Adobe packages font better. - # You can 100% use noto-fonts-cjk-{sans,serif} if you prefer consistency/other reason. - # - # Using VF to reduce closure size: - # Version 1579 -> 1580: - # home-manager: -10.4 KiB - # inter: -12695.6 KiB - # jetbrains-mono: -7621.0 KiB fonts.fontconfig.enable = true; home.packages = with pkgs; [ - (nerdfonts.override {fonts = ["NerdFontsSymbolsOnly"];}) + (nerdfonts.override { + fonts = ["NerdFontsSymbolsOnly"]; + }) (inter.overrideAttrs { installPhase = '' runHook preInstall @@ -63,9 +55,22 @@ runHook postInstall ''; }) - noto-fonts - noto-fonts-color-emoji + (source-sans.overrideAttrs { + installPhase = '' + runHook preInstall + install -Dm444 VF/*.otf -t $out/share/fonts/variable + runHook postInstall + ''; + }) + (source-serif.overrideAttrs { + installPhase = '' + runHook preInstall + install -Dm444 VAR/*.otf -t $out/share/fonts/variable + runHook postInstall + ''; + }) source-han-sans-vf-otf source-han-serif-vf-otf + noto-fonts-color-emoji ]; } diff --git a/hosts/aristotle/graphical/home/fonts/fonts.conf b/hosts/aristotle/graphical/home/fonts/fonts.conf index f45ba1e..002433e 100644 --- a/hosts/aristotle/graphical/home/fonts/fonts.conf +++ b/hosts/aristotle/graphical/home/fonts/fonts.conf @@ -10,6 +10,7 @@ serif + Source Serif 4 Variable Source Han Serif SC VF Noto Color Emoji