fix locale
This commit is contained in:
parent
952fb59019
commit
2e994e636e
@ -141,27 +141,28 @@
|
|||||||
];
|
];
|
||||||
|
|
||||||
# Locale
|
# Locale
|
||||||
i18n.defaultLocale = "en_US.UTF-8";
|
i18n.defaultLocale = "en_IE.UTF-8";
|
||||||
i18n.extraLocaleSettings = {
|
i18n.extraLocaleSettings = {
|
||||||
LANGUAGE = "en_US.UTF-8";
|
LANGUAGE = "en_IE:en:C:ru_RU";
|
||||||
LC_ALL = "en_US.UTF-8";
|
LC_TIME = "en_DK.UTF-8";
|
||||||
LC_TIME = "en_US.UTF-8";
|
|
||||||
LC_ADDRESS = "ru_RU.UTF-8";
|
LC_ADDRESS = "ru_RU.UTF-8";
|
||||||
LC_MONETARY = "ru_RU.UTF-8";
|
LC_MONETARY = "ru_RU.UTF-8";
|
||||||
|
LC_NUMERIC = "ru_RU.UTF-8";
|
||||||
LC_PAPER = "ru_RU.UTF-8";
|
LC_PAPER = "ru_RU.UTF-8";
|
||||||
|
LC_TELEPHONE = "ru_RU.UTF-8";
|
||||||
};
|
};
|
||||||
i18n.supportedLocales = [
|
i18n.supportedLocales = [
|
||||||
"C.UTF-8/UTF-8"
|
"C.UTF-8/UTF-8"
|
||||||
|
"en_DK.UTF-8/UTF-8"
|
||||||
|
"en_GB.UTF-8/UTF-8"
|
||||||
|
"en_IE.UTF-8/UTF-8"
|
||||||
"en_US.UTF-8/UTF-8"
|
"en_US.UTF-8/UTF-8"
|
||||||
"ru_RU.UTF-8/UTF-8"
|
"ru_RU.UTF-8/UTF-8"
|
||||||
"en_GB.UTF-8/UTF-8"
|
|
||||||
];
|
];
|
||||||
time.timeZone = "Europe/Helsinki";
|
time.timeZone = "Europe/Vienna";
|
||||||
environment.sessionVariables = {
|
environment.sessionVariables = {
|
||||||
XKB_DEFAULT_LAYOUT = "us,ru";
|
XKB_DEFAULT_LAYOUT = "us,ru";
|
||||||
XKB_DEFAULT_OPTIONS = "grp:win_space_toggle";
|
XKB_DEFAULT_OPTIONS = "grp:win_space_toggle";
|
||||||
LANGUAGE = "en_US.UTF-8";
|
|
||||||
LC_ALL = "en_US.UTF-8";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
# Hardened
|
# Hardened
|
||||||
|
@ -1,29 +1,32 @@
|
|||||||
{ config, ... }:
|
{ config, ... }:
|
||||||
let
|
let
|
||||||
en = "en_US.UTF-8";
|
c = "C.UTF-8";
|
||||||
|
dk = "en_DK.UTF-8";
|
||||||
|
gb = "en_GB.UTF-8";
|
||||||
|
ie = "en_IE.UTF-8";
|
||||||
ru = "ru_RU.UTF-8";
|
ru = "ru_RU.UTF-8";
|
||||||
|
us = "en_US.UTF-8";
|
||||||
|
lang = "en_IE:en:C:ru_RU";
|
||||||
in {
|
in {
|
||||||
i18n.defaultLocale = en;
|
i18n.defaultLocale = ie;
|
||||||
i18n.extraLocaleSettings = {
|
i18n.extraLocaleSettings = {
|
||||||
LANGUAGE = en;
|
LANGUAGE = lang;
|
||||||
LC_ALL = en;
|
LC_TIME = dk;
|
||||||
LC_TIME = en;
|
|
||||||
LC_ADDRESS = ru;
|
LC_ADDRESS = ru;
|
||||||
LC_MONETARY = ru;
|
LC_MONETARY = ru;
|
||||||
|
LC_NUMERIC = ru;
|
||||||
LC_PAPER = ru;
|
LC_PAPER = ru;
|
||||||
|
LC_TELEPHONE = ru;
|
||||||
};
|
};
|
||||||
i18n.supportedLocales = [
|
i18n.supportedLocales = map (x: "${x}/UTF-8") [
|
||||||
"C.UTF-8/UTF-8"
|
c dk gb ie ru us
|
||||||
"en_US.UTF-8/UTF-8"
|
|
||||||
"en_GB.UTF-8/UTF-8"
|
|
||||||
"ru_RU.UTF-8/UTF-8"
|
|
||||||
];
|
];
|
||||||
|
|
||||||
environment.sessionVariables = {
|
environment.sessionVariables = {
|
||||||
XKB_DEFAULT_LAYOUT = "us,ru";
|
XKB_DEFAULT_LAYOUT = "us,ru";
|
||||||
XKB_DEFAULT_OPTIONS = "grp:win_space_toggle";
|
XKB_DEFAULT_OPTIONS = "grp:win_space_toggle";
|
||||||
LANGUAGE = en;
|
# LANGUAGE = lang;
|
||||||
LC_ALL = en;
|
# LC_ALL = en;
|
||||||
};
|
};
|
||||||
|
|
||||||
time.timeZone = "Europe/Moscow";
|
time.timeZone = "Europe/Moscow";
|
||||||
@ -36,11 +39,16 @@ in {
|
|||||||
|
|
||||||
home-manager.users.${config.mainuser} = {
|
home-manager.users.${config.mainuser} = {
|
||||||
home.language = {
|
home.language = {
|
||||||
|
base = ie;
|
||||||
|
time = dk;
|
||||||
address = ru;
|
address = ru;
|
||||||
monetary = ru;
|
monetary = ru;
|
||||||
|
numeric = ru;
|
||||||
paper = ru;
|
paper = ru;
|
||||||
time = en;
|
telephone = ru;
|
||||||
base = en;
|
};
|
||||||
|
home.sessionVariables = {
|
||||||
|
LANGUAGE = lang;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user