systemd-boot is default now
This commit is contained in:
parent
b431744859
commit
42209ddb6a
9 changed files with 15 additions and 25 deletions
|
|
@ -45,7 +45,6 @@ osbmModules = {
|
|||
disko = {
|
||||
enable = true;
|
||||
fileSystem = "zfs"; # options: "zfs", "ext4"
|
||||
systemd-boot = true;
|
||||
initrd-ssh = {
|
||||
enable = true;
|
||||
ethernetDrivers = [ "igc" ];
|
||||
|
|
|
|||
|
|
@ -34,7 +34,6 @@
|
|||
disko = {
|
||||
enable = true;
|
||||
fileSystem = "zfs";
|
||||
systemd-boot = true;
|
||||
|
||||
initrd-ssh = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -16,10 +16,6 @@
|
|||
hardware.sound.enable = true;
|
||||
};
|
||||
|
||||
# Bootloader.
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
|
||||
networking.hostName = "tartarus"; # Define your hostname.
|
||||
|
||||
# Enable networking
|
||||
|
|
|
|||
|
|
@ -14,8 +14,6 @@
|
|||
services.cloudflared.enable = true;
|
||||
};
|
||||
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
i18n.inputMethod.enable = lib.mkForce false;
|
||||
networking.hostName = "wallfacer";
|
||||
system.stateVersion = "25.05";
|
||||
|
|
|
|||
|
|
@ -21,10 +21,6 @@
|
|||
i18n.enable = true;
|
||||
};
|
||||
|
||||
# Bootloader.
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
|
||||
networking.hostName = "ymir"; # Define your hostname.
|
||||
|
||||
networking.firewall.allowedTCPPorts = [
|
||||
|
|
|
|||
8
modules/nixos/hardware/boot.nix
Normal file
8
modules/nixos/hardware/boot.nix
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
{config, lib, ...}:
|
||||
|
||||
{
|
||||
config = lib.mkIf (config.osbmModules.hardware.systemd-boot.enable) {
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,5 +1,6 @@
|
|||
{
|
||||
imports = [
|
||||
./boot.nix
|
||||
./sound.nix
|
||||
./nvidia.nix
|
||||
./hibernation.nix
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@
|
|||
}:
|
||||
let
|
||||
cfg = config.osbmModules.hardware.disko;
|
||||
inherit (config.networking) hostName;
|
||||
|
||||
# Default authorized keys for initrd SSH
|
||||
defaultAuthorizedKeys = [
|
||||
|
|
@ -27,12 +26,6 @@ in
|
|||
];
|
||||
|
||||
config = lib.mkMerge [
|
||||
# Systemd-boot setup
|
||||
(lib.mkIf (cfg.enable && cfg.systemd-boot) {
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
})
|
||||
|
||||
# Initrd SSH for remote unlocking
|
||||
(lib.mkIf (cfg.enable && cfg.initrd-ssh.enable) {
|
||||
boot.initrd.network.enable = true;
|
||||
|
|
|
|||
|
|
@ -185,6 +185,12 @@
|
|||
};
|
||||
};
|
||||
|
||||
systemd-boot.enable = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = true;
|
||||
description = "Use systemd-boot bootloader";
|
||||
};
|
||||
|
||||
# Disko configuration (inspired by ZFS.nix)
|
||||
disko = {
|
||||
enable = lib.mkOption {
|
||||
|
|
@ -208,12 +214,6 @@
|
|||
description = "Root filesystem type";
|
||||
};
|
||||
|
||||
systemd-boot = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = true;
|
||||
description = "Use systemd-boot bootloader";
|
||||
};
|
||||
|
||||
initrd-ssh = {
|
||||
enable = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue