about summary refs log tree commit diff
diff options
context:
space:
mode:
authorProfpatsch <mail@profpatsch.de>2020-08-21 13:30:59 +0200
committerProfpatsch <mail@profpatsch.de>2020-08-21 13:30:59 +0200
commit95ecb196ab358a618910db709e268d9ec2c09d26 (patch)
tree80a53a272abd0293a8a2a0b093f95c49177dafbd
parentcb64a5e2373a356167a8546b86a9fed783fa6fcb (diff)
machines/shiki: improve font settings
Explicitely set default fonts for (sans)serif, monospace and emoji.

Add Noto Color Emoji as emoji font.
-rw-r--r--machines/profpatsch/shiki.nix37
1 files changed, 26 insertions, 11 deletions
diff --git a/machines/profpatsch/shiki.nix b/machines/profpatsch/shiki.nix
index a7e28ceb..c26e64c0 100644
--- a/machines/profpatsch/shiki.nix
+++ b/machines/profpatsch/shiki.nix
@@ -274,17 +274,32 @@ in {
       videoDrivers = [ "intel" ];
     };
 
-    fonts.fonts = [
-      unfreeAndNonDistributablePkgs.corefonts
-      pkgs.source-han-sans-japanese
-      pkgs.source-han-sans-korean
-      pkgs.source-han-sans-simplified-chinese
-      pkgs.source-code-pro
-      pkgs.hasklig
-      pkgs.dejavu_fonts
-      pkgs.ubuntu_font_family
-      pkgs.league-of-moveable-type
-    ];
+    fonts = {
+      fonts = [
+        unfreeAndNonDistributablePkgs.corefonts
+        pkgs.source-han-sans-japanese
+        pkgs.source-han-sans-korean
+        pkgs.source-han-sans-simplified-chinese
+        pkgs.source-code-pro
+        pkgs.hasklig
+        pkgs.dejavu_fonts
+        pkgs.ubuntu_font_family
+        pkgs.league-of-moveable-type
+        pkgs.noto-fonts-emoji
+        # pkgs.zbalermorna
+      ];
+
+      enableDefaultFonts = true;
+      fontconfig = {
+        enable = true;
+        defaultFonts = {
+          monospace = [ "Source Code Pro" ];
+          serif = [ "Liberation Serif" ];
+          sansSerif = [ "Liberation Sans" ];
+          emoji = [ "Noto Color Emoji" "Noto Emoji" ];
+        };
+      };
+    };
 
     services.printing = {
       enable = true;