From 513cdc70bfe5c6f7af3113afa8c3bcb5b4b98700 Mon Sep 17 00:00:00 2001
From: Greg Hellings <greg.hellings@gmail.com>
Date: Fri, 23 Jan 2026 18:01:35 -0600
Subject: [PATCH] Hopefully streamline it

---
 img/builder.nix |  8 ++++++++
 lib.nix         | 23 ++++++++++++++---------
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/img/builder.nix b/img/builder.nix
index 67cdd05..a63c77a 100644
--- a/img/builder.nix
+++ b/img/builder.nix
@@ -23,6 +23,13 @@ let
       destination = "/etc/containers/policy.json";
     }
   );
+  nix-conf = writeTextFile {
+    name = "nix.conf";
+    text = ''
+      extra-experimental-features = nix-command flakes
+    '';
+    destination = "/etc/nix/nix.conf";
+  };
 in
 lib'.mkImage {
   name = name "builder";
@@ -30,6 +37,7 @@ lib'.mkImage {
     buildah
     git
     nix
+    nix-conf
     nix-output-monitor
     nodejs_24
     podman
diff --git a/lib.nix b/lib.nix
index 26d8e00..94995c3 100644
--- a/lib.nix
+++ b/lib.nix
@@ -2,15 +2,20 @@
 
 {
   basePackages = with pkgs; [
-    bashInteractive
-    cacert
-    coreutils-full
-    dockerTools.binSh
-    dockerTools.caCertificates
-    dockerTools.usrBinEnv
-    findutils
-    gnugrep
-    gnused
+    (pkgs.buildEnv {
+      name = "base-env";
+      paths = [
+        bashInteractive
+        cacert
+        coreutils-full
+        dockerTools.binSh
+        dockerTools.caCertificates
+        dockerTools.usrBinEnv
+        findutils
+        gnugrep
+        gnused
+      ];
+    })
   ];
 
   mkImage =