osbm/flake
1
0
Fork 0
Code Issues Pull requests Wiki Activity

systemd-boot is default now

Browse source
This commit is contained in:
Osman Faruk Bayram 2025-10-21 21:02:44 +03:00
parent b431744859
commit 42209ddb6a
9 changed files with 15 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -45,7 +45,6 @@ osbmModules = {
disko = { disko = {
enable = true; enable = true;
fileSystem = "zfs"; # options: "zfs", "ext4" fileSystem = "zfs"; # options: "zfs", "ext4"
systemd-boot = true;
initrd-ssh = { initrd-ssh = {
enable = true; enable = true;
ethernetDrivers = [ "igc" ]; ethernetDrivers = [ "igc" ];

1
hosts/nixos/apollo/configuration.nix
View file

@ -34,7 +34,6 @@
disko = { disko = {
enable = true; enable = true;
fileSystem = "zfs"; fileSystem = "zfs";
systemd-boot = true;
initrd-ssh = { initrd-ssh = {
enable = true; enable = true;

4
hosts/nixos/tartarus/configuration.nix
View file

@ -16,10 +16,6 @@
hardware.sound.enable = true; hardware.sound.enable = true;
}; };
# Bootloader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
networking.hostName = "tartarus"; # Define your hostname. networking.hostName = "tartarus"; # Define your hostname.
# Enable networking # Enable networking

2
hosts/nixos/wallfacer/configuration.nix
View file

@ -14,8 +14,6 @@
services.cloudflared.enable = true; services.cloudflared.enable = true;
}; };
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
i18n.inputMethod.enable = lib.mkForce false; i18n.inputMethod.enable = lib.mkForce false;
networking.hostName = "wallfacer"; networking.hostName = "wallfacer";
system.stateVersion = "25.05"; system.stateVersion = "25.05";

4
hosts/nixos/ymir/configuration.nix
View file

@ -21,10 +21,6 @@
i18n.enable = true; i18n.enable = true;
}; };
# Bootloader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
networking.hostName = "ymir"; # Define your hostname. networking.hostName = "ymir"; # Define your hostname.
networking.firewall.allowedTCPPorts = [ networking.firewall.allowedTCPPorts = [

8
modules/nixos/hardware/boot.nix Normal file
View 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
modules/nixos/hardware/default.nix
View file

@ -1,5 +1,6 @@
{ {
imports = [ imports = [
./boot.nix
./sound.nix ./sound.nix
./nvidia.nix ./nvidia.nix
./hibernation.nix ./hibernation.nix

7
modules/nixos/hardware/disko.nix
View file

@ -7,7 +7,6 @@
}: }:
let let
cfg = config.osbmModules.hardware.disko; cfg = config.osbmModules.hardware.disko;
inherit (config.networking) hostName;
# Default authorized keys for initrd SSH # Default authorized keys for initrd SSH
defaultAuthorizedKeys = [ defaultAuthorizedKeys = [
@ -27,12 +26,6 @@ in
]; ];
config = lib.mkMerge [ 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 # Initrd SSH for remote unlocking
(lib.mkIf (cfg.enable && cfg.initrd-ssh.enable) { (lib.mkIf (cfg.enable && cfg.initrd-ssh.enable) {
boot.initrd.network.enable = true; boot.initrd.network.enable = true;

12
modules/nixos/options.nix
View file

@ -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 configuration (inspired by ZFS.nix)
disko = { disko = {
enable = lib.mkOption { enable = lib.mkOption {
@ -208,12 +214,6 @@
description = "Root filesystem type"; description = "Root filesystem type";
}; };
systemd-boot = lib.mkOption {
type = lib.types.bool;
default = true;
description = "Use systemd-boot bootloader";
};
initrd-ssh = { initrd-ssh = {
enable = lib.mkOption { enable = lib.mkOption {
type = lib.types.bool; type = lib.types.bool;