refactor(nixosModules): add dmerge with mkMerge example

tao3k · Sep 21, 2023 · de70f91 · de70f91
1 parent 902f479
commit de70f91
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/examples/nixos/pops/nixosModules.nix b/examples/nixos/pops/nixosModules.nix
@@ -4,12 +4,9 @@
     (POP.extendPop flops.haumea.pops.exporter (
       self: super: {
         exports.customModules.boot =
+          with dmerge;
           self.outputsForTarget.dmerge
-            {
-              config.loader = {
-                timeout = 10;
-              };
-            }
+            { config.contents = update [ 0 ] [ { content.loader.timeout.content = 10; } ]; }
             [ "boot" ];
       }
     ))

diff --git a/nixos/nixosModules/boot/default.nix b/nixos/nixosModules/boot/default.nix
@@ -17,9 +17,19 @@ with lib; {
     })
   ];
 
-  # config.loader.timeout = 1;
-
   options = {
+    __profiles__.test = mkOption {
+      type = types.unspecified;
+      default = mkMerge [
+        (mkIf true {
+          loader = {
+            timeout = mkIf cfg.__profiles__.speedup 0;
+            systemd-boot.enable = true;
+            efi.canTouchEfiVariables = true;
+          };
+        })
+      ];
+    };
     __profiles__.speedup = mkOption {
       type = types.bool;
       default = false;