Infinidoge/universe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(modules/locale): fix fonts and locale

Browse source
This commit is contained in:
Infinidoge 2021-12-04 15:26:56 -05:00
parent a31b684cf5
commit 5ca9eb4543
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
modules/modules/locale.nix
View file

@ -8,17 +8,12 @@ in
{ {
options.modules.locale = with types; { options.modules.locale = with types; {
keymap = mkOpt str "us"; keymap = mkOpt str "us";
locale = mkOpt str "en_us.UTF-8"; locale = mkOpt str "en_US.UTF-8";
timezone = mkOpt str "America/New_York"; timezone = mkOpt str "America/New_York";
fonts = { fonts = {
fonts = mkOpt (listOf package) [ ]; fonts = mkOpt (listOf package) [ ];
defaults = { defaults = mkOpt attrs { };
serif = mkOpt (listOf str) [ "DejaVu Serif" ];
emoji = mkOpt (listOf str) [ "Noto Color Emoji" ];
monospace = mkOpt (listOf str) [ "DejaVu Sans Mono" ];
sansSerif = mkOpt (listOf str) [ "DejaVu Sans" ];
};
}; };
}; };
@ -30,7 +25,10 @@ in
time.timeZone = cfg.timezone; time.timeZone = cfg.timezone;
fonts.fontconfig.defaultFonts = cfg.fonts.defaults; fonts = {
fonts = cfg.fonts.fonts;
fontconfig.defaultFonts = mkAliasDefinitions opt.fonts.defaults;
};
console.packages = cfg.fonts.fonts; console.packages = cfg.fonts.fonts;
}; };

1
users/infinidoge/default.nix
View file

@ -92,6 +92,7 @@ in
fonts = with pkgs; [ fonts = with pkgs; [
(nerdfonts.override { fonts = config.modules.locale.fonts.defaults.monospace; }) (nerdfonts.override { fonts = config.modules.locale.fonts.defaults.monospace; })
dejavu_fonts dejavu_fonts
emacs-all-the-icons-fonts
]; ];
defaults = { defaults = {