meta: Move fonts out of desktop

This commit is contained in:
Donovan Glover 2024-09-10 12:25:54 -04:00
parent 065c987dff
commit c23d476f78
No known key found for this signature in database
GPG Key ID: EA7408A77AE1BE65
2 changed files with 47 additions and 43 deletions

View File

@ -1,5 +1,4 @@
{
nix-config,
pkgs,
config,
lib,
@ -9,7 +8,6 @@
let
inherit (config.modules.system) username;
inherit (config.boot) isContainer;
inherit (nix-config.packages.${pkgs.system}) aleo-fonts;
inherit (lib)
mkEnableOption
@ -142,46 +140,5 @@ in
wl-clipboard-rs
])
];
fonts = {
enableDefaultPackages = false;
packages =
[
aleo-fonts
]
++ (with pkgs; [
noto-fonts
noto-fonts-cjk-serif
noto-fonts-cjk-sans
noto-fonts-emoji
maple-mono
font-awesome
(nerdfonts.override { fonts = [ "Noto" ]; })
kanji-stroke-order-font
liberation_ttf
]);
fontconfig = {
defaultFonts = {
serif = [
"Noto Serif CJK JP"
"Noto Serif"
];
sansSerif = [
"Noto Sans CJK JP"
"Noto Sans"
];
monospace = [
"Noto Sans Mono CJK JP"
"Noto Sans Mono"
];
};
allowBitmaps = false;
};
};
};
}

47
modules/fonts.nix Normal file
View File

@ -0,0 +1,47 @@
{ nix-config, pkgs, ... }:
let
inherit (nix-config.packages.${pkgs.system}) aleo-fonts;
in
{
fonts = {
enableDefaultPackages = false;
packages =
[
aleo-fonts
]
++ (with pkgs; [
noto-fonts
noto-fonts-cjk-serif
noto-fonts-cjk-sans
noto-fonts-emoji
maple-mono
font-awesome
(nerdfonts.override { fonts = [ "Noto" ]; })
kanji-stroke-order-font
liberation_ttf
]);
fontconfig = {
defaultFonts = {
serif = [
"Noto Serif CJK JP"
"Noto Serif"
];
sansSerif = [
"Noto Sans CJK JP"
"Noto Sans"
];
monospace = [
"Noto Sans Mono CJK JP"
"Noto Sans Mono"
];
};
allowBitmaps = false;
};
};
}