From abbc37508d87fc3a0aa88274e42aedeefab897c5 Mon Sep 17 00:00:00 2001
From: Gautier DI FOLCO <gautier.difolco@gmail.com>
Date: Thu, 15 Aug 2024 15:25:03 +0200
Subject: [PATCH] fixup!  feat: add flag to disable containers tooling
 (cachix#1367)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Jörg Thalheim <Mic92@users.noreply.github.com>
---
 src/modules/containers.nix | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/modules/containers.nix b/src/modules/containers.nix
index 227641acf..fb7797793 100644
--- a/src/modules/containers.nix
+++ b/src/modules/containers.nix
@@ -135,20 +135,15 @@ let
       }
     ];
 
-    config = lib.attrsets.mergeAttrsList [
-      {
-        User = "${user}";
-        WorkingDir = "${homeDir}";
-      }
-      (if cfg.isDev then {
-        Env = lib.mapAttrsToList (name: value: "${name}=${toString value}")
+    config = {
+      User = "${user}";
+      WorkingDir = "${homeDir}";
+    } // lib.optionalAttrs cfg.isDev {
+      Env = lib.mapAttrsToList (name: value: "${name}=${toString value}")
           config.env ++ [ "HOME=${homeDir}" "USER=${user}" ];
-        Entrypoint = cfg.entrypoint;
-        Cmd = [ cfg.startupCommand ];
-      } else
-        { })
-    ];
-  };
+      Entrypoint = cfg.entrypoint;
+      Cmd = [ cfg.startupCommand ];
+   };
 
   # <registry> <args>
   mkCopyScript = cfg: pkgs.writeShellScript "copy-container" ''