diff --git a/Droidnix/README.org b/Droidnix/README.org index bf26174da..14e023181 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -341,37 +341,31 @@ in ** =generated/modules/system/boot.nix= #+BEGIN_SRC nix :tangle generated/modules/system/boot.nix :noweb tangle :mkdirp yes :eval never-html -{ lib, config, pkgs, ... }: +# ./generated/hosts/traveldroid/traveldroid.nix +{ config, pkgs, lib, ... }: let coreEnabled = config.mySystem.system.core.enable or false; -in -{ - options.mySystem.system.locale.enable = lib.mkEnableOption "Boot settings"; +in lib.mkIf coreEnabled { + boot = { + initrd = { + verbose = false; + kernelModules = [ ]; + }; - config = lib.mkIf (coreEnabled || config.mySystem.system.locale.enable) { + extraModulePackages = [ ]; + kernelPackages = pkgs.linuxPackages_latest; + kernelParams = [ "silent" ]; - boot = { - initrd = { - verbose = false; # its a lot of logs. dont need it, unless we do. - kernelModules = [ ]; # no kernel modules on boot - }; + consoleLogLevel = 0; + plymouth.enable = true; + supportedFilesystems = [ "ntfs" ]; - extraModulePackages = [ ]; # no extra packages on boot either - kernelPackages = pkgs.linuxPackages_latest; # latest greatest linux kernel - kernelParams = [ "silent" ]; # quiet those logs - - consoleLogLevel = 0; # quiten more logs - plymouth.enable = true; # graphical boot animation instead - - supportedFilesystems = [ "ntfs" ]; # should see the ntfs (windows) - - loader = { - systemd-boot.enable = true; # systemd-boot - systemd-boot.configurationLimit = 10; - efi.canTouchEfiVariables = true; # allow editing efi to edit the boot loader - timeout = 5; # grub timeout to make a selection - }; + loader = { + systemd-boot.enable = true; + systemd-boot.configurationLimit = 10; + efi.canTouchEfiVariables = true; + timeout = 5; }; }; } diff --git a/Droidnix/generated/modules/system/boot.nix b/Droidnix/generated/modules/system/boot.nix index 472aabd2c..74926f7ee 100644 --- a/Droidnix/generated/modules/system/boot.nix +++ b/Droidnix/generated/modules/system/boot.nix @@ -1,34 +1,28 @@ -{ lib, config, pkgs, ... }: +# ./generated/hosts/traveldroid/traveldroid.nix +{ config, pkgs, lib, ... }: let coreEnabled = config.mySystem.system.core.enable or false; -in -{ - options.mySystem.system.locale.enable = lib.mkEnableOption "Boot settings"; +in lib.mkIf coreEnabled { + boot = { + initrd = { + verbose = false; + kernelModules = [ ]; + }; - config = lib.mkIf (coreEnabled || config.mySystem.system.locale.enable) { + extraModulePackages = [ ]; + kernelPackages = pkgs.linuxPackages_latest; + kernelParams = [ "silent" ]; - boot = { - initrd = { - verbose = false; # its a lot of logs. dont need it, unless we do. - kernelModules = [ ]; # no kernel modules on boot - }; + consoleLogLevel = 0; + plymouth.enable = true; + supportedFilesystems = [ "ntfs" ]; - extraModulePackages = [ ]; # no extra packages on boot either - kernelPackages = pkgs.linuxPackages_latest; # latest greatest linux kernel - kernelParams = [ "silent" ]; # quiet those logs - - consoleLogLevel = 0; # quiten more logs - plymouth.enable = true; # graphical boot animation instead - - supportedFilesystems = [ "ntfs" ]; # should see the ntfs (windows) - - loader = { - systemd-boot.enable = true; # systemd-boot - systemd-boot.configurationLimit = 10; - efi.canTouchEfiVariables = true; # allow editing efi to edit the boot loader - timeout = 5; # grub timeout to make a selection - }; + loader = { + systemd-boot.enable = true; + systemd-boot.configurationLimit = 10; + efi.canTouchEfiVariables = true; + timeout = 5; }; }; }