summaryrefslogtreecommitdiff
path: root/system-profiles
diff options
context:
space:
mode:
Diffstat (limited to 'system-profiles')
-rw-r--r--system-profiles/default-locale.nix1
-rw-r--r--system-profiles/initrd-all-crypto-modules.nix14
2 files changed, 8 insertions, 7 deletions
diff --git a/system-profiles/default-locale.nix b/system-profiles/default-locale.nix
index de2db1d7..cc103c9e 100644
--- a/system-profiles/default-locale.nix
+++ b/system-profiles/default-locale.nix
@@ -6,6 +6,7 @@
6 i18n.defaultLocale = "en_DK.UTF-8"; 6 i18n.defaultLocale = "en_DK.UTF-8";
7 console.keyMap = lib.mkDefault "dvorak-programmer"; 7 console.keyMap = lib.mkDefault "dvorak-programmer";
8 time.timeZone = lib.mkDefault "Europe/Berlin"; 8 time.timeZone = lib.mkDefault "Europe/Berlin";
9 services.kmscon.extraOptions = "--xkb-layout=us --xkb-variant=dvp --no-mouse";
9 } 10 }
10 ] ++ (lib.optional (options ? i18n.extraLocales) { 11 ] ++ (lib.optional (options ? i18n.extraLocales) {
11 i18n.extraLocales = [ "C.UTF-8/UTF-8" "en_US.UTF-8/UTF-8" ]; 12 i18n.extraLocales = [ "C.UTF-8/UTF-8" "en_US.UTF-8/UTF-8" ];
diff --git a/system-profiles/initrd-all-crypto-modules.nix b/system-profiles/initrd-all-crypto-modules.nix
index da6c781e..84f2129a 100644
--- a/system-profiles/initrd-all-crypto-modules.nix
+++ b/system-profiles/initrd-all-crypto-modules.nix
@@ -14,11 +14,11 @@ in {
14 boot.initrd.luks.cryptoModules = moduleList ++ [ 14 boot.initrd.luks.cryptoModules = moduleList ++ [
15 "encrypted_keys" "trusted" "rng" 15 "encrypted_keys" "trusted" "rng"
16 ]; 16 ];
17 boot.kernelPatches = [ 17 # boot.kernelPatches = [
18 { 18 # {
19 name = "encrypted_key"; 19 # name = "encrypted_keys";
20 patch = null; 20 # patch = null;
21 structuredExtraConfig.ENCRYPTED_KEYS = lib.kernel.yes; 21 # structuredExtraConfig.ENCRYPTED_KEYS = lib.kernel.yes;
22 } 22 # }
23 ]; 23 # ];
24} 24}