From abb7bd815c2ff73bdf279fc2e91ce4583770dc39 Mon Sep 17 00:00:00 2001 From: Natsu Kagami Date: Wed, 11 Dec 2024 17:07:12 +0100 Subject: [PATCH] yoga: new nerd-fonts not compatible with 24.11 --- modules/personal/fonts/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/modules/personal/fonts/default.nix b/modules/personal/fonts/default.nix index 8d59fd8..99203d3 100644 --- a/modules/personal/fonts/default.nix +++ b/modules/personal/fonts/default.nix @@ -1,6 +1,13 @@ -{ pkgs, lib, ... }: +{ pkgs, lib, config, ... }: with lib; +let + nerd-fonts = + if builtins.hasAttr "nerd-fonts" pkgs then + pkgs.nerd-fonts.symbols-only + else + pkgs.nerdfonts.override { fonts = [ "NerdFontsSymbolsOnly" ]; }; +in { imports = [ ./mounting.nix ]; # Fonts @@ -8,7 +15,7 @@ with lib; packages = with pkgs; mkForce [ noto-fonts-emoji-blob-bin ibm-plex - nerd-fonts.symbols-only + nerd-fonts noto-fonts (pkgs.noto-fonts-cjk-sans or pkgs.noto-fonts-cjk) merriweather