From 801594dd2168c6d99b34de0bc26ec037aa91ebee Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Thu, 24 Sep 2026 10:56:18 +0200
Subject: ...

---
 system-profiles/tmpfs-root.nix | 46 +++++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

(limited to 'system-profiles')

diff --git a/system-profiles/tmpfs-root.nix b/system-profiles/tmpfs-root.nix
index 7840dadf..3b4eb9a7 100644
--- a/system-profiles/tmpfs-root.nix
+++ b/system-profiles/tmpfs-root.nix
@@ -1,25 +1,25 @@
 { options, lib, ... }: {
-  config = lib.mkMerge
-    [ (lib.mkIf (options ? disko) {
-        disko.devices.nodev = {
-          "/" = {
-            fsType = "tmpfs";
-            mountOptions = [
-              "mode=0755"
-            ];
-          };
-        };
-      })
-      (lib.mkIf (!(options ? disko)) {
-        fileSystems."/" = {
-          fsType = "tmpfs";
-          options = [ "mode=0755" ];
-        };
-      })
-      {
-        security.sudo.extraConfig = ''
-          Defaults lecture = never
-        '';
-      }
-    ];
+  config = foldr recursiveUpdate {} ([
+    {
+      security.sudo.extraConfig = ''
+        Defaults lecture = never
+      '';
+    }
+  ]
+  ++ (lib.optional (options ? disko) {
+    disko.devices.nodev = {
+      "/" = {
+        fsType = "tmpfs";
+        mountOptions = [
+          "mode=0755"
+        ];
+      };
+    };
+  })
+  ++ (lib.optional (!(options ? disko)) {
+    fileSystems."/" = {
+      fsType = "tmpfs";
+      options = [ "mode=0755" ];
+    };
+  }));
 }
-- 
cgit v1.2.3