From 82ec91b4d2c253c6ccb783f960a2788f230d6ad1 Mon Sep 17 00:00:00 2001 From: Collin Williams <96917990+bluedragon1221@users.noreply.github.com> Date: Tue, 8 Jul 2025 17:03:20 +0000 Subject: start avoiding lib.enum; start using hjem generators --- modules/boot/options.nix | 4 +--- modules/boot/system/default.nix | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'modules/boot') diff --git a/modules/boot/options.nix b/modules/boot/options.nix index c040032..dc6d3b3 100644 --- a/modules/boot/options.nix +++ b/modules/boot/options.nix @@ -7,9 +7,7 @@ in { options = { collinux.boot = { - bootloader = mkOption { - type = types.enum ["grub" "systemd-boot"]; - }; + systemd-boot.enable = mkEnableOption "systemd-boot"; plymouth = { enable = mkEnableOption "plymouth bootsplash"; theme = mkOption { diff --git a/modules/boot/system/default.nix b/modules/boot/system/default.nix index e32601c..53f18be 100644 --- a/modules/boot/system/default.nix +++ b/modules/boot/system/default.nix @@ -17,11 +17,10 @@ in { systemd.enable = true; }; loader = { - systemd-boot = lib.optionalAttrs (cfg.bootloader == "systemd-boot" && !cfg.secureBoot.enable) { + systemd-boot = lib.optionalAttrs (cfg.systemd-boot.enable && !cfg.secureBoot.enable) { enable = true; configurationLimit = 3; }; - grub = lib.optionalAttrs (cfg.bootloader == "grub") {enable = true;}; efi.canTouchEfiVariables = true; timeout = 0; }; -- cgit v1.3.1