fixup! feat: add flag to disable containers tooling (#1367)

Co-authored-by: Jörg Thalheim <[email protected]>
cachix · Aug 15, 2024 · abbc375 · abbc375
1 parent 7fa15b0
commit abbc375
Showing 1 changed file with 8 additions and 13 deletions.
diff --git 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" ''