SebastianStork/nixos-config
1
0
Fork 0
mirror of https://github.com/SebastianStork/nixos-config.git synced 2026-01-21 23:11:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Correct boot module structure

Browse source
This commit is contained in:
SebastianStork 2024-06-04 17:39:17 +02:00
parent 646fcbf7ec
commit 347d359863
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
hosts/inspiron/default.nix
View file

@ -8,8 +8,8 @@
networking.hostName = "inspiron"; networking.hostName = "inspiron";
myConfig = { myConfig = {
boot-loader = { boot = {
systemd-boot.enable = true; loader.systemd-boot.enable = true;
silent = true; silent = true;
}; };

4
hosts/north/default.nix
View file

@ -8,8 +8,8 @@
networking.hostName = "north"; networking.hostName = "north";
myConfig = { myConfig = {
boot-loader = { boot = {
systemd-boot.enable = true; loader.systemd-boot.enable = true;
silent = true; silent = true;
}; };

8
modules/system/boot-loader.nix → modules/system/boot.nix
View file

@ -1,12 +1,12 @@
{ config, lib, ... }: { config, lib, ... }:
{ {
options.myConfig.boot-loader = { options.myConfig.boot = {
systemd-boot.enable = lib.mkEnableOption ""; loader.systemd-boot.enable = lib.mkEnableOption "";
silent = lib.mkEnableOption ""; silent = lib.mkEnableOption "";
}; };
config = lib.mkMerge [ config = lib.mkMerge [
(lib.mkIf config.myConfig.boot-loader.systemd-boot.enable { (lib.mkIf config.myConfig.boot.loader.systemd-boot.enable {
boot.tmp.cleanOnBoot = true; boot.tmp.cleanOnBoot = true;
boot.loader = { boot.loader = {
systemd-boot = { systemd-boot = {
@ -20,7 +20,7 @@
systemd.watchdog.rebootTime = "10"; systemd.watchdog.rebootTime = "10";
}) })
(lib.mkIf config.myConfig.boot-loader.silent { (lib.mkIf config.myConfig.boot.silent {
boot = { boot = {
kernelParams = [ kernelParams = [
"quiet" "quiet"

2
modules/system/default.nix
View file

@ -10,7 +10,7 @@
./de.nix ./de.nix
./dm.nix ./dm.nix
./sound.nix ./sound.nix
./boot-loader.nix ./boot.nix
./printing.nix ./printing.nix
./syncthing.nix ./syncthing.nix
./nix-helper.nix ./nix-helper.nix