From b49348f8874438d6201b85e4528fc30a566a3720 Mon Sep 17 00:00:00 2001
From: Felix Tenley <dev@felschr.com>
Date: Fri, 11 Sep 2020 14:58:56 +0200
Subject: [PATCH] feat(font): update fonts & fix emoji

---
 home/shell/terminal.nix |  4 ----
 system/default.nix      | 22 ++++++----------------
 2 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/home/shell/terminal.nix b/home/shell/terminal.nix
index 37b4506..74bc8c1 100644
--- a/home/shell/terminal.nix
+++ b/home/shell/terminal.nix
@@ -17,10 +17,6 @@ in
 
   programs.kitty = {
     enable = true;
-    font = {
-      name = "Fira Code";
-      package = pkgs.fira-code;
-    };
     extraConfig = ''
       ${with builtins; readFile ./kitty-gruvbox-dark.conf}
     '';
diff --git a/system/default.nix b/system/default.nix
index 37b981a..f2737c8 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -22,22 +22,12 @@
     noto-fonts-cjk
     noto-fonts-emoji
   ];
-  fonts.fontconfig.localConf = ''
-    <fontconfig>
-      <alias binding="weak">
-        <family>sans-serif</family>
-        <prefer>
-          <family>emoji</family>
-        </prefer>
-      </alias>
-      <alias binding="weak">
-        <family>serif</family>
-        <prefer>
-          <family>emoji</family>
-        </prefer>
-      </alias>
-    </fontconfig>
-  '';
+  fonts.fontconfig.defaultFonts = {
+    serif = [ "Noto Serif" "Noto Color Emoji" ];
+    sansSerif = [ "Noto Sans" "Noto Color Emoji" ];
+    monospace = [ "Fira Code" "Noto Color Emoji" ];
+    emoji = [ "Noto Color Emoji" ];
+  };
 
   services.printing.enable = true;
   services.fwupd.enable = true;