fix imports
attempt to fix imports #3 attempt to fix imports #4 attempt to fix imports #5 attempt to fix imports #6 attempt to fix imports #7 attempt to fix imports #8 Revert "attempt to fix imports #8" This reverts commit 43b115c78e85f7e68ae935dc3cae703b7730e8ba. Revert "attempt to fix imports #7" This reverts commit 588c83aba244a5d02fd811bb565984169e769ff1. Revert "attempt to fix imports #6" This reverts commit f0640591656679a2e684d2198dd808498ca9dc80. Revert "attempt to fix imports #5" This reverts commit 61bd0e180b2f5f6ea823d88fa28a696c1fa72283. Revert "attempt to fix imports #4" This reverts commit 8cf9662367ab3b3cf45df212a38844b91442df28. more attempts more attempts #2 more attempts #3 more attempts #4 more attempts #5 Revert "more attempts #5" This reverts commit 24773ffd75faa777312dda09a52a791c14c10fb2. Revert "more attempts #4" This reverts commit 68de4fabbaad8dc8764711bd7c93bfde36d11df5. more attempts #6
This commit is contained in:
parent
40651fb6b2
commit
16110bb326
2 changed files with 26 additions and 24 deletions
|
@ -13,8 +13,6 @@ in {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
imports = [] ++
|
imports = [./modules/localisation.nix]
|
||||||
(optionals cfg.enable ([]
|
;
|
||||||
++ optionals cfg.enableLocale [./modules/localisation.nix]
|
|
||||||
));
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,25 +1,29 @@
|
||||||
{
|
{ config, lib, ... }: let
|
||||||
time.timeZone = "Europe/Berlin";
|
cfg = config.grimmShared;
|
||||||
|
in {
|
||||||
|
config = with cfg; lib.mkIf (enable && enableLocale) {
|
||||||
|
time.timeZone = "Europe/Berlin";
|
||||||
|
|
||||||
# Select internationalisation properties.
|
# Select internationalisation properties.
|
||||||
i18n.defaultLocale = "en_US.UTF-8";
|
i18n.defaultLocale = "en_US.UTF-8";
|
||||||
|
|
||||||
|
i18n.extraLocaleSettings = {
|
||||||
|
LC_ADDRESS = "de_DE.UTF-8";
|
||||||
|
LC_IDENTIFICATION = "de_DE.UTF-8";
|
||||||
|
LC_MEASUREMENT = "de_DE.UTF-8";
|
||||||
|
LC_MONETARY = "de_DE.UTF-8";
|
||||||
|
LC_NAME = "de_DE.UTF-8";
|
||||||
|
LC_NUMERIC = "de_DE.UTF-8";
|
||||||
|
LC_PAPER = "de_DE.UTF-8";
|
||||||
|
LC_TELEPHONE = "de_DE.UTF-8";
|
||||||
|
LC_TIME = "de_DE.UTF-8";
|
||||||
|
};
|
||||||
|
|
||||||
i18n.extraLocaleSettings = {
|
console.keyMap = "de";
|
||||||
LC_ADDRESS = "de_DE.UTF-8";
|
|
||||||
LC_IDENTIFICATION = "de_DE.UTF-8";
|
|
||||||
LC_MEASUREMENT = "de_DE.UTF-8";
|
|
||||||
LC_MONETARY = "de_DE.UTF-8";
|
|
||||||
LC_NAME = "de_DE.UTF-8";
|
|
||||||
LC_NUMERIC = "de_DE.UTF-8";
|
|
||||||
LC_PAPER = "de_DE.UTF-8";
|
|
||||||
LC_TELEPHONE = "de_DE.UTF-8";
|
|
||||||
LC_TIME = "de_DE.UTF-8";
|
|
||||||
};
|
|
||||||
|
|
||||||
console.keyMap = "de";
|
services.xserver.xkb = {
|
||||||
|
layout = "de";
|
||||||
services.xserver.xkb = {
|
variant = "";
|
||||||
layout = "de";
|
};
|
||||||
variant = "";
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue