feat: add fallback fonts for cyrillic symbols
This commit is contained in:
parent
e92581f2b2
commit
66033bda2d
@ -109,6 +109,8 @@ in
|
|||||||
"font.name.monospace.x-western" = fonts.mono.family;
|
"font.name.monospace.x-western" = fonts.mono.family;
|
||||||
"font.name.sans-serif.x-western" = fonts.sans.family;
|
"font.name.sans-serif.x-western" = fonts.sans.family;
|
||||||
"font.name.serif.x-western" = fonts.serif.family;
|
"font.name.serif.x-western" = fonts.serif.family;
|
||||||
|
"font.name.sans-serif.x-cyrillic" = fonts.cyrillic.family;
|
||||||
|
"font.name.serif.x-cyrillic" = fonts.cyrillic.family;
|
||||||
"browser.display.background_color" = colors.color0;
|
"browser.display.background_color" = colors.color0;
|
||||||
"browser.display.foreground_color" = colors.color5;
|
"browser.display.foreground_color" = colors.color5;
|
||||||
"browser.anchor_color" = colors.color13;
|
"browser.anchor_color" = colors.color13;
|
||||||
@ -160,6 +162,8 @@ in
|
|||||||
"font.name.monospace.x-western" = fonts.mono.family;
|
"font.name.monospace.x-western" = fonts.mono.family;
|
||||||
"font.name.sans-serif.x-western" = fonts.sans.family;
|
"font.name.sans-serif.x-western" = fonts.sans.family;
|
||||||
"font.name.serif.x-western" = fonts.serif.family;
|
"font.name.serif.x-western" = fonts.serif.family;
|
||||||
|
"font.name.sans-serif.x-cyrillic" = fonts.cyrillic.family;
|
||||||
|
"font.name.serif.x-cyrillic" = fonts.cyrillic.family;
|
||||||
"browser.display.background_color" = colors.color0;
|
"browser.display.background_color" = colors.color0;
|
||||||
"browser.display.foreground_color" = colors.color5;
|
"browser.display.foreground_color" = colors.color5;
|
||||||
"browser.anchor_color" = colors.color13;
|
"browser.anchor_color" = colors.color13;
|
||||||
|
@ -1,8 +1,4 @@
|
|||||||
{
|
{ config, lib, ... }:
|
||||||
config,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
let
|
let
|
||||||
inherit (lib) mkEnableOption mkIf unique;
|
inherit (lib) mkEnableOption mkIf unique;
|
||||||
cfg = config.ataraxia.defaults.fonts;
|
cfg = config.ataraxia.defaults.fonts;
|
||||||
@ -21,6 +17,7 @@ in
|
|||||||
fonts.mono.package
|
fonts.mono.package
|
||||||
fonts.emoji.package
|
fonts.emoji.package
|
||||||
fonts.icons.package
|
fonts.icons.package
|
||||||
|
fonts.cyrillic.package
|
||||||
];
|
];
|
||||||
|
|
||||||
fonts = {
|
fonts = {
|
||||||
@ -29,8 +26,14 @@ in
|
|||||||
defaultFonts = {
|
defaultFonts = {
|
||||||
emoji = [ fonts.emoji.family ];
|
emoji = [ fonts.emoji.family ];
|
||||||
monospace = [ fonts.mono.family ];
|
monospace = [ fonts.mono.family ];
|
||||||
sansSerif = [ fonts.sans.family ];
|
sansSerif = [
|
||||||
serif = [ fonts.serif.family ];
|
fonts.sans.family
|
||||||
|
fonts.cyrillic.family
|
||||||
|
];
|
||||||
|
serif = [
|
||||||
|
fonts.serif.family
|
||||||
|
fonts.cyrillic.family
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -47,6 +47,10 @@ in
|
|||||||
type = submodule fontSubmodule;
|
type = submodule fontSubmodule;
|
||||||
default = { };
|
default = { };
|
||||||
};
|
};
|
||||||
|
cyrillic = mkOption {
|
||||||
|
type = submodule fontSubmodule;
|
||||||
|
default = { };
|
||||||
|
};
|
||||||
size = mkOption {
|
size = mkOption {
|
||||||
type = submodule {
|
type = submodule {
|
||||||
options =
|
options =
|
||||||
@ -125,6 +129,10 @@ in
|
|||||||
family = "Rose-Pine";
|
family = "Rose-Pine";
|
||||||
package = pkgs.rosepine-gtk-icons;
|
package = pkgs.rosepine-gtk-icons;
|
||||||
};
|
};
|
||||||
|
cyrillic = {
|
||||||
|
family = "PT Sans";
|
||||||
|
package = pkgs.paratype-pt-sans;
|
||||||
|
};
|
||||||
size.big = 14;
|
size.big = 14;
|
||||||
size.normal = 12;
|
size.normal = 12;
|
||||||
size.small = 11;
|
size.small = 11;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user