fix locale and font troubles

This commit is contained in:
Joakim Repomaa
2025-02-02 15:34:28 +02:00
parent c757f0892d
commit 94d9a45a38
3 changed files with 14 additions and 3 deletions

View File

@@ -23,7 +23,7 @@
noto-fonts
noto-fonts-cjk-sans
noto-fonts-color-emoji
google-fonts
source-sans-pro
mosh
docker-compose
signal-desktop
@@ -64,6 +64,7 @@
tutanota-desktop
imapsync
nixfmt-rfc-style
tree
];
programs = {
@@ -344,6 +345,7 @@
defaultFonts = {
emoji = [ "Noto Color Emoji" ];
monospace = [ "IosevkaTerm NFM" ];
sansSerif = [ "Source Sans Pro" ];
};
};

View File

@@ -1,4 +1,4 @@
{ config, lib, ... }:
{ config, lib, osConfig, ... }:
let
cfg = config.gnome;
in
@@ -68,6 +68,10 @@ in
showWeekNumbers = lib.mkEnableOption { };
};
automaticTimeZone = lib.mkEnableOption { };
region = lib.mkOption {
type = str;
default = osConfig.i18n.defaultLocale;
};
};
config = {
@@ -108,6 +112,9 @@ in
"org/gnome/desktop/datetime" = {
automatic-timezone = cfg.automaticTimeZone;
};
"system/locale" = {
region = cfg.region;
};
} // (
builtins.listToAttrs (
lib.lists.imap0