From 20d546e8b6755577f79e2df71281ca2b93ef405c Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 9 Dec 2020 16:02:16 +0100
Subject: tv: drop custom boot.initrd.luks.cryptoModules

---
 tv/1systems/alnus/config.nix  | 1 -
 tv/1systems/mu/config.nix     | 1 -
 tv/1systems/nomic/config.nix  | 5 +----
 tv/1systems/querel/config.nix | 9 +++------
 tv/1systems/wu/config.nix     | 5 +----
 tv/1systems/xu/config.nix     | 5 +----
 tv/1systems/zu/config.nix     | 5 +----
 7 files changed, 7 insertions(+), 24 deletions(-)

(limited to 'tv')

diff --git a/tv/1systems/alnus/config.nix b/tv/1systems/alnus/config.nix
index ed5fb671c..54f845ec2 100644
--- a/tv/1systems/alnus/config.nix
+++ b/tv/1systems/alnus/config.nix
@@ -11,7 +11,6 @@ with import <stockholm/lib>;
   boot = {
     initrd = {
       availableKernelModules = [ "ahci" ];
-      luks.cryptoModules = [ "aes" "sha512" "xts" ];
       luks.devices.luksroot.device = "/dev/sda2";
     };
   };
diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix
index b6a25a2b8..d5169281d 100644
--- a/tv/1systems/mu/config.nix
+++ b/tv/1systems/mu/config.nix
@@ -15,7 +15,6 @@ with import <stockholm/lib>;
   tv.x0vncserver.enable = true;
 
   boot.initrd.luks.devices.muca.device = "/dev/sda2";
-  boot.initrd.luks.cryptoModules = [ "aes" "sha512" "xts" ];
   boot.initrd.availableKernelModules = [ "ahci" ];
   boot.kernelModules = [ "fbcon" "kvm-intel" ];
   boot.extraModulePackages = [ ];
diff --git a/tv/1systems/nomic/config.nix b/tv/1systems/nomic/config.nix
index 38cc62369..4dc0b4e82 100644
--- a/tv/1systems/nomic/config.nix
+++ b/tv/1systems/nomic/config.nix
@@ -15,10 +15,7 @@ with import <stockholm/lib>;
     <stockholm/tv/2configs/xserver>
   ];
 
-  boot.initrd.luks = {
-    cryptoModules = [ "aes" "sha512" "xts" ];
-    devices.luks1.device = "/dev/sda2";
-  };
+  boot.initrd.luks.devices.luks1.device = "/dev/sda2";
 
   # Don't use UEFI because current disk was partitioned/formatted for AO753.
   # TODO remove following bool.loader section after repartitioning/reformatting
diff --git a/tv/1systems/querel/config.nix b/tv/1systems/querel/config.nix
index e58a9b216..96d8d2b6a 100644
--- a/tv/1systems/querel/config.nix
+++ b/tv/1systems/querel/config.nix
@@ -11,12 +11,9 @@ with import <stockholm/lib>;
   krebs.build.user = mkForce config.krebs.users.itak;
 
   boot.initrd.availableKernelModules = [ "ahci" ];
-  boot.initrd.luks = {
-    cryptoModules = [ "aes" "sha512" "xts" ];
-    devices.querel-luks1 = {
-      allowDiscards = true;
-      device = "/dev/sda2";
-    };
+  boot.initrd.luks.devices.querel-luks1 = {
+    allowDiscards = true;
+    device = "/dev/sda2";
   };
   boot.kernelModules = [ "kvm-intel" ];
   boot.loader = {
diff --git a/tv/1systems/wu/config.nix b/tv/1systems/wu/config.nix
index d4114f00a..f9c3860ed 100644
--- a/tv/1systems/wu/config.nix
+++ b/tv/1systems/wu/config.nix
@@ -16,10 +16,7 @@ with import <stockholm/lib>;
     <stockholm/tv/2configs/xserver>
   ];
 
-  boot.initrd.luks = {
-    cryptoModules = [ "aes" "sha512" "xts" ];
-    devices.wuca.device = "/dev/sda2";
-  };
+  boot.initrd.luks.devices.wuca.device = "/dev/sda2";
 
   fileSystems = {
     "/" = {
diff --git a/tv/1systems/xu/config.nix b/tv/1systems/xu/config.nix
index 65b49ed9c..86c2b13e5 100644
--- a/tv/1systems/xu/config.nix
+++ b/tv/1systems/xu/config.nix
@@ -111,10 +111,7 @@ with import <stockholm/lib>;
     }
   ];
 
-  boot.initrd.luks = {
-    cryptoModules = [ "aes" "sha512" "xts" ];
-    devices.xuca.device = "/dev/sda2";
-  };
+  boot.initrd.luks.devices.xuca.device = "/dev/sda2";
 
   fileSystems = {
     "/" = {
diff --git a/tv/1systems/zu/config.nix b/tv/1systems/zu/config.nix
index 5a69601e9..8a3040a36 100644
--- a/tv/1systems/zu/config.nix
+++ b/tv/1systems/zu/config.nix
@@ -16,10 +16,7 @@ with import <stockholm/lib>;
     <stockholm/tv/2configs/xserver>
   ];
 
-  boot.initrd.luks = {
-    cryptoModules = [ "aes" "sha512" "xts" ];
-    devices.zuca.device = "/dev/sda2";
-  };
+  boot.initrd.luks.devices.zuca.device = "/dev/sda2";
 
   fileSystems = {
     "/" = {
-- 
cgit v1.2.3