mirror of
https://github.com/alyraffauf/nixcfg.git
synced 2024-12-22 05:12:56 -05:00
flake: add lanzaboote and systemd-boot modules; hosts: move bootloader settings to modules (#198)
This commit is contained in:
parent
89dc68452f
commit
b3200ec381
15
common/lanzaboote.nix
Normal file
15
common/lanzaboote.nix
Normal file
|
@ -0,0 +1,15 @@
|
|||
{lib, ...}: {
|
||||
boot = {
|
||||
initrd.systemd.enable = true;
|
||||
|
||||
lanzaboote = {
|
||||
enable = true;
|
||||
pkiBundle = "/etc/secureboot";
|
||||
};
|
||||
|
||||
loader = {
|
||||
efi.canTouchEfiVariables = true;
|
||||
systemd-boot.enable = lib.mkForce false;
|
||||
};
|
||||
};
|
||||
}
|
10
common/systemd-boot.nix
Normal file
10
common/systemd-boot.nix
Normal file
|
@ -0,0 +1,10 @@
|
|||
{...}: {
|
||||
boot = {
|
||||
initrd.systemd.enable = true;
|
||||
|
||||
loader = {
|
||||
efi.canTouchEfiVariables = true;
|
||||
systemd-boot.enable = true;
|
||||
};
|
||||
};
|
||||
}
|
|
@ -160,10 +160,12 @@
|
|||
nixosModules = {
|
||||
common-auto-upgrade = import ./common/autoUpgrade.nix;
|
||||
common-base = import ./common/base.nix;
|
||||
common-lanzaboote = import ./common/lanzaboote.nix;
|
||||
common-locale = import ./common/locale.nix;
|
||||
common-mauville-share = import ./common/samba.nix;
|
||||
common-nix = import ./common/nix.nix;
|
||||
common-pkgs = import ./common/pkgs.nix;
|
||||
common-systemd-boot = import ./common/systemd-boot.nix;
|
||||
common-tailscale = import ./common/tailscale.nix;
|
||||
common-wifi-profiles = import ./common/wifi.nix;
|
||||
|
||||
|
|
|
@ -15,15 +15,11 @@
|
|||
self.nixosModules.common-mauville-share
|
||||
self.nixosModules.common-nix
|
||||
self.nixosModules.common-pkgs
|
||||
self.nixosModules.common-systemd-boot
|
||||
self.nixosModules.common-wifi-profiles
|
||||
self.nixosModules.hw-framework-13-intel-11th
|
||||
];
|
||||
|
||||
boot.loader = {
|
||||
efi.canTouchEfiVariables = true;
|
||||
systemd-boot.enable = true;
|
||||
};
|
||||
|
||||
environment.variables.GDK_SCALE = "1.5";
|
||||
networking.hostName = "fallarbor";
|
||||
system.stateVersion = "24.05";
|
||||
|
|
|
@ -13,6 +13,7 @@
|
|||
(import ./../../disko/luks-btrfs-subvolumes.nix {disks = ["/dev/nvme0n1"];})
|
||||
self.nixosModules.common-auto-upgrade
|
||||
self.nixosModules.common-base
|
||||
self.nixosModules.common-lanzaboote
|
||||
self.nixosModules.common-locale
|
||||
self.nixosModules.common-mauville-share
|
||||
self.nixosModules.common-nix
|
||||
|
@ -23,20 +24,6 @@
|
|||
self.nixosModules.hw-framework-13-amd-7000
|
||||
];
|
||||
|
||||
boot = {
|
||||
initrd.systemd.enable = true;
|
||||
|
||||
lanzaboote = {
|
||||
enable = true;
|
||||
pkiBundle = "/etc/secureboot";
|
||||
};
|
||||
|
||||
loader = {
|
||||
efi.canTouchEfiVariables = true;
|
||||
systemd-boot.enable = lib.mkForce false;
|
||||
};
|
||||
};
|
||||
|
||||
environment.variables.GDK_SCALE = "2";
|
||||
networking.hostName = "lavaridge";
|
||||
|
||||
|
|
|
@ -17,6 +17,7 @@ in {
|
|||
./stylix.nix
|
||||
self.nixosModules.common-auto-upgrade
|
||||
self.nixosModules.common-base
|
||||
self.nixosModules.common-lanzaboote
|
||||
self.nixosModules.common-locale
|
||||
self.nixosModules.common-nix
|
||||
self.nixosModules.common-pkgs
|
||||
|
@ -26,27 +27,11 @@ in {
|
|||
self.nixosModules.hw-common-amd-cpu
|
||||
self.nixosModules.hw-common-amd-gpu
|
||||
self.nixosModules.hw-common-bluetooth
|
||||
self.nixosModules.hw-common-ssd
|
||||
self.nixosModules.hw-common-gaming
|
||||
self.nixosModules.hw-common-ssd
|
||||
];
|
||||
|
||||
boot = {
|
||||
initrd = {
|
||||
availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "sd_mod" "r8169"];
|
||||
systemd.enable = true;
|
||||
};
|
||||
|
||||
lanzaboote = {
|
||||
enable = true;
|
||||
pkiBundle = "/etc/secureboot";
|
||||
};
|
||||
|
||||
loader = {
|
||||
efi.canTouchEfiVariables = true;
|
||||
systemd-boot.enable = lib.mkForce false;
|
||||
};
|
||||
};
|
||||
|
||||
boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "sd_mod" "r8169"];
|
||||
networking.hostName = "mauville";
|
||||
|
||||
services = {
|
||||
|
|
|
@ -12,6 +12,7 @@
|
|||
(import ./../../disko/luks-btrfs-subvolumes.nix {disks = ["/dev/sda"];})
|
||||
self.nixosModules.common-auto-upgrade
|
||||
self.nixosModules.common-base
|
||||
self.nixosModules.common-lanzaboote
|
||||
self.nixosModules.common-locale
|
||||
self.nixosModules.common-mauville-share
|
||||
self.nixosModules.common-nix
|
||||
|
@ -21,20 +22,6 @@
|
|||
self.nixosModules.hw-thinkpad-t440p
|
||||
];
|
||||
|
||||
boot = {
|
||||
initrd.systemd.enable = true;
|
||||
|
||||
lanzaboote = {
|
||||
enable = true;
|
||||
pkiBundle = "/etc/secureboot";
|
||||
};
|
||||
|
||||
loader = {
|
||||
efi.canTouchEfiVariables = true;
|
||||
systemd-boot.enable = lib.mkForce false;
|
||||
};
|
||||
};
|
||||
|
||||
environment.variables.GDK_SCALE = "1.25";
|
||||
networking.hostName = "rustboro";
|
||||
system.stateVersion = "24.05";
|
||||
|
|
Loading…
Reference in a new issue