System/Servenix: Enable nvidia-container-toolkit

system/modules/docker/default.nix

@@ -10,7 +10,7 @@ in {
 
   config = lib.mkIf docker.enable {
     environment.variables = lib.mkMerge [
-      (lib.mkIf (!docker.podman) {
+      (lib.mkIf ((!docker.podman) && docker.buildkit) {
         DOCKER_BUILDKIT = 1;
       })
     ];

system/modules/docker/options.nix

@@ -7,6 +7,7 @@
 
   podman = lib.mkEnableOption "Use podman instead of docker";
   docker.rootless = lib.mkEnableOption "Use rootless docker (no effect if podman is used)";
+  docker.buildkit = lib.mkEnableOption "Use Docker BuildKit (no effect if podman is used)";
 
   networks = lib.mkOption {
     type = lib.types.listOf (lib.types.submodule ({

system/servenix/hardware-configuration.nix

@@ -65,9 +65,7 @@
     enableRedistributableFirmware = true;
     cpu.intel.updateMicrocode = true;
     bluetooth.enable = false;
-
-    # TODO: Jul 09 22:54:59 servenix dockerd[17484]: error initializing buildkit: error creating buildkit instance: CDI registry initialization failure: failed to load CDI Spec failed to parse CDI Spec "/var/run/cdi/nvidia-container-toolkit.json", no Spec data
-    # nvidia-container-toolkit.enable = true;
+    nvidia-container-toolkit.enable = true;
 
     nvidia = {
       package = config.boot.kernelPackages.nvidiaPackages.stable;