Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tv: drop custom boot.initrd.luks.cryptoModules

Browse Source
This commit is contained in:
tv 2020-12-09 16:02:16 +01:00
parent 311c93143c
commit 20d546e8b6
7 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tv/1systems/alnus/config.nix
View File

@ -11,7 +11,6 @@ with import <stockholm/lib>;
boot = { boot = {
initrd = { initrd = {
availableKernelModules = [ "ahci" ]; availableKernelModules = [ "ahci" ];
luks.cryptoModules = [ "aes" "sha512" "xts" ];
luks.devices.luksroot.device = "/dev/sda2"; luks.devices.luksroot.device = "/dev/sda2";
}; };
}; };

1
tv/1systems/mu/config.nix
View File

@ -15,7 +15,6 @@ with import <stockholm/lib>;
tv.x0vncserver.enable = true; tv.x0vncserver.enable = true;
boot.initrd.luks.devices.muca.device = "/dev/sda2"; boot.initrd.luks.devices.muca.device = "/dev/sda2";
boot.initrd.luks.cryptoModules = [ "aes" "sha512" "xts" ];
boot.initrd.availableKernelModules = [ "ahci" ]; boot.initrd.availableKernelModules = [ "ahci" ];
boot.kernelModules = [ "fbcon" "kvm-intel" ]; boot.kernelModules = [ "fbcon" "kvm-intel" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];

5
tv/1systems/nomic/config.nix
View File

@ -15,10 +15,7 @@ with import <stockholm/lib>;
<stockholm/tv/2configs/xserver> <stockholm/tv/2configs/xserver>
]; ];
boot.initrd.luks = { boot.initrd.luks.devices.luks1.device = "/dev/sda2";
cryptoModules = [ "aes" "sha512" "xts" ];
devices.luks1.device = "/dev/sda2";
};
# Don't use UEFI because current disk was partitioned/formatted for AO753. # Don't use UEFI because current disk was partitioned/formatted for AO753.
# TODO remove following bool.loader section after repartitioning/reformatting # TODO remove following bool.loader section after repartitioning/reformatting

5
tv/1systems/querel/config.nix
View File

@ -11,13 +11,10 @@ with import <stockholm/lib>;
krebs.build.user = mkForce config.krebs.users.itak; krebs.build.user = mkForce config.krebs.users.itak;
boot.initrd.availableKernelModules = [ "ahci" ]; boot.initrd.availableKernelModules = [ "ahci" ];
boot.initrd.luks = { boot.initrd.luks.devices.querel-luks1 = {
cryptoModules = [ "aes" "sha512" "xts" ];
devices.querel-luks1 = {
allowDiscards = true; allowDiscards = true;
device = "/dev/sda2"; device = "/dev/sda2";
}; };
};
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
boot.loader = { boot.loader = {
efi.canTouchEfiVariables = true; efi.canTouchEfiVariables = true;

5
tv/1systems/wu/config.nix
View File

@ -16,10 +16,7 @@ with import <stockholm/lib>;
<stockholm/tv/2configs/xserver> <stockholm/tv/2configs/xserver>
]; ];
boot.initrd.luks = { boot.initrd.luks.devices.wuca.device = "/dev/sda2";
cryptoModules = [ "aes" "sha512" "xts" ];
devices.wuca.device = "/dev/sda2";
};
fileSystems = { fileSystems = {
"/" = { "/" = {

5
tv/1systems/xu/config.nix
View File

@ -111,10 +111,7 @@ with import <stockholm/lib>;
} }
]; ];
boot.initrd.luks = { boot.initrd.luks.devices.xuca.device = "/dev/sda2";
cryptoModules = [ "aes" "sha512" "xts" ];
devices.xuca.device = "/dev/sda2";
};
fileSystems = { fileSystems = {
"/" = { "/" = {

5
tv/1systems/zu/config.nix
View File

@ -16,10 +16,7 @@ with import <stockholm/lib>;
<stockholm/tv/2configs/xserver> <stockholm/tv/2configs/xserver>
]; ];
boot.initrd.luks = { boot.initrd.luks.devices.zuca.device = "/dev/sda2";
cryptoModules = [ "aes" "sha512" "xts" ];
devices.zuca.device = "/dev/sda2";
};
fileSystems = { fileSystems = {
"/" = { "/" = {