Switch back to wpa_supplicant, lots of tweaks and simplifications
This commit is contained in:
parent
777ebab1c4
commit
88bf37e5b3
15 changed files with 32 additions and 55 deletions
|
@ -1,7 +1,6 @@
|
|||
{ ... }:
|
||||
{
|
||||
imports = [
|
||||
./extlinux
|
||||
./grub
|
||||
./lanzaboote
|
||||
./plymouth
|
||||
|
|
|
@ -1,10 +0,0 @@
|
|||
{ config, lib, ... }:
|
||||
{
|
||||
options.system.extlinux.enable = lib.mkEnableOption "Enable extlinux";
|
||||
|
||||
config.boot.loader = lib.mkIf config.system.extlinux.enable {
|
||||
grub.enable = false;
|
||||
systemd-boot.enable = lib.mkForce false;
|
||||
generic-extlinux-compatible.enable = true;
|
||||
};
|
||||
}
|
|
@ -1,6 +1,6 @@
|
|||
{ config, lib, ... }:
|
||||
{
|
||||
boot.loader = lib.mkIf config.boot.loader.grub.enable {
|
||||
boot.loader = {
|
||||
grub = {
|
||||
efiSupport = true;
|
||||
efiInstallAsRemovable = true;
|
||||
|
|
|
@ -2,9 +2,6 @@
|
|||
{
|
||||
imports = [ lanzaboote.nixosModules.lanzaboote ];
|
||||
|
||||
boot = lib.mkIf config.boot.lanzaboote.enable {
|
||||
lanzaboote.pkiBundle = "/etc/secureboot";
|
||||
};
|
||||
|
||||
boot.lanzaboote.pkiBundle = "/etc/secureboot";
|
||||
environment.systemPackages = with pkgs; [ sbctl ];
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{ config, lib, ... }:
|
||||
{
|
||||
boot.loader.systemd-boot = lib.mkIf config.boot.loader.systemd-boot.enable {
|
||||
boot.loader.systemd-boot = {
|
||||
editor = false;
|
||||
graceful = true;
|
||||
};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue