From 4cc633505097fbf9a7a8b0683808db5a6c01ccfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kieran.meinhardt@gmail.com>
Date: Fri, 4 Jan 2019 16:36:52 +0100
Subject: [PATCH] Use default fonts

---
 configs/graphics.nix | 2 +-
 configs/packages.nix | 4 ++++
 theme.nix            | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/configs/graphics.nix b/configs/graphics.nix
index 431edc1..a649327 100644
--- a/configs/graphics.nix
+++ b/configs/graphics.nix
@@ -64,7 +64,7 @@
   home-manager.users.kfm = {
     gtk = {
       enable = true;
-      font = with import ../theme.nix; { package = pkgs.cantarell-fonts; name = uiFont.name; };
+      # font = with import ../theme.nix; { package = pkgs.noto-fonts; name = uiFont.name; };
       iconTheme = config.constants.theme.icon;
       theme = config.constants.theme.gtk;
     };
diff --git a/configs/packages.nix b/configs/packages.nix
index f6da82e..4d59a7c 100644
--- a/configs/packages.nix
+++ b/configs/packages.nix
@@ -9,20 +9,24 @@ in with pkgs;
 
   fonts.enableDefaultFonts = true;
   fonts.fonts = [
+    cantarell-fonts
     corefonts
     eb-garamond
     fira
     libertine
     lmodern
+    noto-fonts
     powerline-fonts
     roboto
     xlibs.fontschumachermisc
+    ubuntu_font_family
   ];
 
   environment.systemPackages = [
   ] ++ [ # office
     abiword
     gnumeric
+    typora
   ] ++ [ # theme
     config.constants.theme.gtk.package
     config.constants.theme.icon.package
diff --git a/theme.nix b/theme.nix
index f4b95c1..6292764 100644
--- a/theme.nix
+++ b/theme.nix
@@ -59,8 +59,8 @@ let
     pointerColorForeground = solarizedDark.green.light;
   };
 in rec {
-  uiFont = { name = "Cantarell"; size = 9; };
-  terminalFont = { name = "Source Code Pro for Powerline"; size = 9; };
+  uiFont = { name = "Sans"; size = 9; };
+  terminalFont = { name = "Monospace"; size = 9; };
 
   white = "#ffffff";
   black = "#000000";