diff --git a/examples/nixos/default.nix b/examples/nixos/default.nix index c3719f2..ca8abff 100644 --- a/examples/nixos/default.nix +++ b/examples/nixos/default.nix @@ -14,6 +14,7 @@ in # --custom profiles exporter.nixosProfiles.customProfiles.nix + exporter.nixosModules.customModules.boot exporter.nixosProfiles.customProfiles.boot exporter.srvos.default.common.nix diff --git a/examples/nixos/pops/nixosModules.nix b/examples/nixos/pops/nixosModules.nix index 6eee7ca..dc3e402 100644 --- a/examples/nixos/pops/nixosModules.nix +++ b/examples/nixos/pops/nixosModules.nix @@ -2,6 +2,15 @@ .addExporters [ (POP.extendPop flops.haumea.pops.exporter ( - self: super: { exports.customModules = { }; } + self: super: { + exports.customModules.boot = + self.outputsForTarget.dmerge + { + config.loader = { + timeout = 10; + }; + } + [ "boot" ]; + } )) ] diff --git a/nixos/nixosModules/boot/default.nix b/nixos/nixosModules/boot/default.nix index f449f0e..47405fa 100644 --- a/nixos/nixosModules/boot/default.nix +++ b/nixos/nixosModules/boot/default.nix @@ -2,10 +2,11 @@ with lib; { # do we need to import the submodules automatically in imports? imports = [ (modulesPath + "/installer/scan/not-detected.nix") - (modulesPath + "/virtualisation/google-compute-image.nix") + # (modulesPath + "/virtualisation/google-compute-image.nix") (loadSubmodule ./systemd-initrd.nix) ({ environment.systemPackages = [ nixpkgs.hello ]; }) ]; + config = mkMerge [ (mkIf cfg.__profiles__.systemd-boot.enable { loader = { @@ -16,6 +17,8 @@ with lib; { }) ]; + # config.loader.timeout = 1; + options = { __profiles__.speedup = mkOption { type = types.bool; diff --git a/nixos/nixosProfiles/presets/boot.nix b/nixos/nixosProfiles/presets/boot.nix index 137c5d8..a6c82dd 100644 --- a/nixos/nixosProfiles/presets/boot.nix +++ b/nixos/nixosProfiles/presets/boot.nix @@ -1,4 +1,5 @@ { - imports = [ POS.nixosModules.boot ]; + # imports = [ POS.nixosModules.boot ]; boot.__profiles__.systemd-boot.enable = true; + boot.__profiles__.speedup = true; }