b12f restructure #1

Merged
teutat3s merged 218 commits from b12f into main 2020-11-24 18:27:01 +00:00
Showing only changes of commit bf29ac8830 - Show all commits

View file

@ -9,6 +9,11 @@ with lib;
default = false;
description = "Feature flag for iso builds";
};
options.pub-solar.x-os.disk-encryption-active = mkOption {
type = types.bool;
default = true;
description = "Whether it should be assumed that there is a cryptroot device";
};
config = {
# Enable plymouth for better experience of booting
boot.plymouth.enable = true;
@ -16,7 +21,7 @@ with lib;
# Mount / luks device in initrd
# Allow fstrim to work on it.
# The ! makes this enabled by default
boot.initrd = mkIf (!cfg.iso-options.enable) {
boot.initrd = mkIf (!cfg.iso-options.enable && cfg.disk-encryption-active) {
luks.devices."cryptroot" = {
allowDiscards = true;
};