3 files changed, 31 insertions, 30 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 @@
       i18n.defaultLocale = "en_DK.UTF-8";
       console.keyMap = lib.mkDefault "dvorak-programmer";
       time.timeZone = lib.mkDefault "Europe/Berlin";
+      services.kmscon.extraOptions = "--xkb-layout=us --xkb-variant=dvp --no-mouse";
     }
   ] ++ (lib.optional (options ? i18n.extraLocales) {
     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 5d10a993..84f2129a 100644
--- a/system-profiles/initrd-all-crypto-modules.nix
+++ b/system-profiles/initrd-all-crypto-modules.nix
@@ -14,11 +14,11 @@ in {
   boot.initrd.luks.cryptoModules = moduleList ++ [
     "encrypted_keys" "trusted" "rng"
   ];
-  boot.kernelPatches = [
-    {
-      name = "encrypted_keys";
-      patch = null;
-      structuredExtraConfig.ENCRYPTED_KEYS = lib.kernel.yes;
-    }
-  ];
+  # boot.kernelPatches = [
+  #   {
+  #     name = "encrypted_keys";
+  #     patch = null;
+  #     structuredExtraConfig.ENCRYPTED_KEYS = lib.kernel.yes;
+  #   }
+  # ];
 }
diff --git a/system-profiles/tmpfs-root.nix b/system-profiles/tmpfs-root.nix
index 7840dadf..5a04a166 100644
--- a/system-profiles/tmpfs-root.nix
+++ b/system-profiles/tmpfs-root.nix
@@ -1,25 +1,25 @@
 { options, lib, ... }: {
-  config = lib.mkMerge
-    [ (lib.mkIf (options ? disko) {
-        disko.devices.nodev = {
-          "/" = {
-            fsType = "tmpfs";
-            mountOptions = [
-              "mode=0755"
-            ];
-          };
-        };
-      })
-      (lib.mkIf (!(options ? disko)) {
-        fileSystems."/" = {
-          fsType = "tmpfs";
-          options = [ "mode=0755" ];
-        };
-      })
-      {
-        security.sudo.extraConfig = ''
-          Defaults lecture = never
-        '';
-      }
-    ];
+  config = lib.foldr lib.recursiveUpdate {} ([
+    {
+      security.sudo.extraConfig = ''
+        Defaults lecture = never
+      '';
+    }
+  ]
+  ++ (lib.optional (options ? disko) {
+    disko.devices.nodev = {
+      "/" = {
+        fsType = "tmpfs";
+        mountOptions = [
+          "mode=0755"
+        ];
+      };
+    };
+  })
+  ++ (lib.optional (!(options ? disko)) {
+    fileSystems."/" = {
+      fsType = "tmpfs";
+      options = [ "mode=0755" ];
+    };
+  }));
 }