Refactored font. Flag. See previous commits.

This commit is contained in:
James Patrick 2021-12-15 00:21:21 -05:00
parent ab33edcb6b
commit 5539a175f8
5 changed files with 29 additions and 27 deletions

View File

@ -14,6 +14,5 @@
./applications ./applications
# TODO Refactor everything after this. # TODO Refactor everything after this.
./cli.nix ./cli.nix
./fonts.nix
]; ];
} }

View File

@ -1,24 +0,0 @@
# Need to read?
{ config, pkgs, ... }: {
fonts = {
enableDefaultFonts = true;
fonts = with pkgs; [
alegreya
fira-code
fira-code-symbols
hasklig
inter
liberation_ttf
noto-fonts
noto-fonts-cjk
noto-fonts-emoji
];
fontconfig = {
defaultFonts = {
serif = [ "inter" ];
sansSerif = [ "alegreya" ];
monospace = [ "hasklig" ];
};
};
};
}

View File

@ -6,7 +6,6 @@ in {
../applications/firefox.nix ../applications/firefox.nix
../applications/nextcloud.nix ../applications/nextcloud.nix
../cli.nix ../cli.nix
../fonts.nix
../system/gtk.nix ../system/gtk.nix
./minimal.nix ./minimal.nix
]; ];

View File

@ -1,3 +1,4 @@
{ config, pkgs, ... }: { { config, pkgs, ... }: {
imports = [ ./gtk.nix ./boot.nix ./xdg.nix ./flatpak.nix ./zfs.nix ]; imports =
[ ./gtk.nix ./boot.nix ./xdg.nix ./flatpak.nix ./zfs.nix ./fonts.nix ];
} }

27
modules/system/fonts.nix Normal file
View File

@ -0,0 +1,27 @@
{ config, lib, pkgs, ... }:
let graphical = config.graphical;
in {
config = lib.mkIf graphical.enable {
fonts = {
enableDefaultFonts = true;
fonts = with pkgs; [
alegreya
fira-code
fira-code-symbols
hasklig
inter
liberation_ttf
noto-fonts
noto-fonts-cjk
noto-fonts-emoji
];
fontconfig = {
defaultFonts = {
serif = [ "inter" ];
sansSerif = [ "alegreya" ];
monospace = [ "hasklig" ];
};
};
};
};
}