From ccdeb4cb8dc5854297671b88c46c7de26e1ffec8 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sun, 25 Oct 2020 14:50:09 -0400 Subject: [PATCH] Move fonts to theme --- modules/desktop/default.nix | 8 -------- modules/themes/alucard/default.nix | 14 +++++++++++++- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix index dab1ff98..ab19874f 100644 --- a/modules/desktop/default.nix +++ b/modules/desktop/default.nix @@ -44,18 +44,10 @@ in { fonts = with pkgs; [ ubuntu_font_family dejavu_fonts - fira-code - fira-code-symbols symbola noto-fonts noto-fonts-cjk - font-awesome-ttf - siji ]; - fontconfig.defaultFonts = { - sansSerif = ["Fira Sans"]; - monospace = ["Fira Code"]; - }; }; ## Apps/Services diff --git a/modules/themes/alucard/default.nix b/modules/themes/alucard/default.nix index 9e59dfc2..0c116b9a 100644 --- a/modules/themes/alucard/default.nix +++ b/modules/themes/alucard/default.nix @@ -43,7 +43,19 @@ in { unstable.dracula-theme paper-icon-theme # for rofi ]; - fonts.fonts = [ pkgs.jetbrains-mono ]; + fonts = { + fonts = with pkgs; [ + fira-code + fira-code-symbols + jetbrains-mono + siji + font-awesome-ttf + ]; + fontconfig.defaultFonts = { + sansSerif = ["Fira Sans"]; + monospace = ["Fira Code"]; + }; + }; # Compositor services.picom = {