3 files changed, 15 insertions, 9 deletions

diff --git a/hosts/skadhi/default.nix b/hosts/skadhi/default.nix
index 847f9e8f..96be2e5b 100644
--- a/hosts/skadhi/default.nix
+++ b/hosts/skadhi/default.nix
@@ -2,7 +2,7 @@
 {
   imports = with flake.nixosModules.systemProfiles; [
     ./hw.nix ./fs.nix
-    tmpfs-root default-locale openssh niri-unstable networkmanager lanzaboote zswap
+    tmpfs-root default-locale openssh niri-unstable networkmanager lanzaboote zswap initrd-all-crypto-modules
     flakeInputs.nixVirt.nixosModules.default
   ];
 
@@ -19,7 +19,7 @@
           };
         };
 
-        luks.cryptoModules = [ "aegis128" ];
+        kernelModules = [ "dm-integrity" ];
       };
 
       lanzaboote.configurationLimit = 15;
@@ -72,5 +72,10 @@
     };
 
     services.userborn.importLegacyState = false;
+
+    services.kmscon = {
+      enable = true;
+      config.hwaccel = true;
+    };
   };
 }
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 da6c781e..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_key";
-      patch = null;
-      structuredExtraConfig.ENCRYPTED_KEYS = lib.kernel.yes;
-    }
-  ];
+  # boot.kernelPatches = [
+  #   {
+  #     name = "encrypted_keys";
+  #     patch = null;
+  #     structuredExtraConfig.ENCRYPTED_KEYS = lib.kernel.yes;
+  #   }
+  # ];
 }