From 11a22f6bf60fc1adf7d797d1ffbda573c4718239 Mon Sep 17 00:00:00 2001 From: seth Date: Sun, 5 Mar 2023 09:39:31 -0500 Subject: simplify fonts config --- hosts/common/fonts.nix | 46 ++++++++++++++++++++-------------------------- 1 file changed, 20 insertions(+), 26 deletions(-) (limited to 'hosts') diff --git a/hosts/common/fonts.nix b/hosts/common/fonts.nix index 5fc180e..698b4fb 100644 --- a/hosts/common/fonts.nix +++ b/hosts/common/fonts.nix @@ -2,32 +2,26 @@ pkgs, desktop, ... -}: let - gui = desktop != ""; -in { +}: +if desktop != "" +then { fonts = { - enableDefaultFonts = gui; - fonts = - if gui - then - with pkgs; [ - corefonts - fira-code - (nerdfonts.override {fonts = ["FiraCode"];}) - noto-fonts - noto-fonts-extra - noto-fonts-emoji - noto-fonts-cjk-sans - ] - else []; - fontconfig.defaultFonts = - if gui - then { - serif = ["Noto Serif"]; - sansSerif = ["Noto Sans"]; - emoji = ["Noto Color Emoji"]; - monospace = ["Fira Code"]; - } - else {}; + enableDefaultFonts = true; + fonts = with pkgs; [ + corefonts + fira-code + (nerdfonts.override {fonts = ["FiraCode"];}) + noto-fonts + noto-fonts-extra + noto-fonts-emoji + noto-fonts-cjk-sans + ]; + fontconfig.defaultFonts = { + serif = ["Noto Serif"]; + sansSerif = ["Noto Sans"]; + emoji = ["Noto Color Emoji"]; + monospace = ["Fira Code"]; + }; }; } +else {} -- cgit v1.2.3