From 8aa858a33e2e4665d2a184a92540740d4f5bad35 Mon Sep 17 00:00:00 2001
From: Mikael Voss <mvs@nyantec.com>
Date: Fri, 18 Oct 2024 19:33:07 +0200
Subject: [PATCH] =?UTF-8?q?nixos/ephemeral:=20Merge=20sub=E2=80=90volume?=
 =?UTF-8?q?=20option=20defaults?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nixos/module/ephemeral.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/nixos/module/ephemeral.nix b/nixos/module/ephemeral.nix
index d8d9ac4..d2bc74d 100644
--- a/nixos/module/ephemeral.nix
+++ b/nixos/module/ephemeral.nix
@@ -104,25 +104,22 @@ let
   subvolumeDefaults = {
     "/etc/keys" = {
       options = [ "nodev" "noexec" "nosuid" ];
-      extraOptions = [ "noatime" "compress=zstd" ];
     };
     "/etc/credstore" = {
       options = [ "nodev" "noexec" "nosuid" ];
-      extraOptions = [ "noatime" "compress=zstd" ];
     };
     "/etc/credstore.encrypted" = {
       options = [ "nodev" "noexec" "nosuid" ];
-      extraOptions = [ "noatime" "compress=zstd" ];
     };
     "/nix" = {
       options = [ "nodev" "nosuid" ];
-      extraOptions = [ "noatime" "compress=zstd" ];
     };
     "/var" = {
       options = [ "nodev" "noexec" "nosuid" ];
-      extraOptions = [ "noatime" "compress=zstd" ];
     };
-  };
+  } |> lib.mapAttrs (name: subvol: subvol // {
+    extraOptions = [ "noatime" "compress=zstd" ];
+  });
 in {
   options = {
     ephemeral = {