diff --git a/hosts/seb-desktop/default.nix b/hosts/seb-desktop/default.nix index 644bb86..013178f 100644 --- a/hosts/seb-desktop/default.nix +++ b/hosts/seb-desktop/default.nix @@ -9,7 +9,10 @@ environment.sessionVariables.FLAKE = "/home/seb/Projects/nixos/my-config"; myConfig = { - boot-loader.systemd-boot.enable = true; + boot-loader = { + systemd-boot.enable = true; + silent = true; + }; dm.sddm.enable = true; de.qtile.enable = true; diff --git a/hosts/seb-laptop/default.nix b/hosts/seb-laptop/default.nix index 4a509fd..58ca8a6 100644 --- a/hosts/seb-laptop/default.nix +++ b/hosts/seb-laptop/default.nix @@ -9,7 +9,10 @@ environment.sessionVariables.FLAKE = "/home/seb/Projects/nixos/my-config"; myConfig = { - boot-loader.systemd-boot.enable = true; + boot-loader = { + systemd-boot.enable = true; + silent = true; + }; dm.lightdm.enable = true; de.qtile.enable = true; diff --git a/modules/system/boot-loader.nix b/modules/system/boot-loader.nix index 0d9cebc..794eaa6 100644 --- a/modules/system/boot-loader.nix +++ b/modules/system/boot-loader.nix @@ -3,18 +3,33 @@ lib, ... }: { - options.myConfig.boot-loader.systemd-boot.enable = lib.mkEnableOption ""; - - config = lib.mkIf config.myConfig.boot-loader.systemd-boot.enable { - boot.tmp.cleanOnBoot = true; - boot.loader = { - systemd-boot = { - enable = true; - editor = false; - configurationLimit = 50; - }; - efi.canTouchEfiVariables = true; - timeout = 3; - }; + options.myConfig.boot-loader = { + systemd-boot.enable = lib.mkEnableOption ""; + silent = lib.mkEnableOption ""; }; + + config = lib.mkMerge [ + (lib.mkIf config.myConfig.boot-loader.systemd-boot.enable { + boot.tmp.cleanOnBoot = true; + boot.loader = { + systemd-boot = { + enable = true; + editor = false; + configurationLimit = 20; + }; + efi.canTouchEfiVariables = true; + timeout = 3; + }; + systemd.watchdog.rebootTime = "10"; + }) + + (lib.mkIf config.myConfig.boot-loader.silent { + boot = { + kernelParams = ["quiet" "rd.systemd.show_status=false" "rd.udev.log_level=3" "udev.log_priority=3"]; + consoleLogLevel = 3; + initrd.verbose = false; + initrd.systemd.enable = true; + }; + }) + ]; }