Modules/Docker: Enable buildkit for docker

home/christoph/default.nix

@@ -275,7 +275,6 @@
     sessionVariables = lib.mkMerge [
       {
         LANG = "en_US.UTF-8";
-        DOCKER_BUILDKIT = 1;
       }
       (lib.mkIf (!headless) {
         # TERMINAL = "alacritty -o font.size=12";

system/modules/docker/default.nix

@@ -9,6 +9,12 @@ in {
   options.modules.docker = import ./options.nix {inherit lib mylib;};
 
   config = lib.mkIf docker.enable {
+    environment.variables = lib.mkMerge [
+      (lib.mkIf (!docker.podman) {
+        DOCKER_BUILDKIT = 1;
+      })
+    ];
+
     virtualisation = {
       docker = {
         enable = !docker.podman;