From a035eca7c6f90485d71107de587e5f6f2637068f Mon Sep 17 00:00:00 2001
From: Christoph Urlacher <christoph.urlacher@protonmail.com>
Date: Wed, 9 Jul 2025 23:16:23 +0200
Subject: [PATCH] Modules/Docker: Enable buildkit for docker

---
 home/christoph/default.nix        | 1 -
 system/modules/docker/default.nix | 6 ++++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/home/christoph/default.nix b/home/christoph/default.nix
index 0f365979..9905bbd8 100644
--- a/home/christoph/default.nix
+++ b/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";
diff --git a/system/modules/docker/default.nix b/system/modules/docker/default.nix
index 32e0d3de..e84d2c81 100644
--- a/system/modules/docker/default.nix
+++ b/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;