diff --git a/.clang-format b/.clang-format
index cc850bf08b..831777e823 100644
--- a/.clang-format
+++ b/.clang-format
@@ -9,4 +9,5 @@ InsertNewlineAtEOF: true
 NamespaceIndentation: All
 SpaceAfterTemplateKeyword: false
 TabWidth: 4
+IncludeBlocks: Preserve
 ...
diff --git a/.envrc b/.envrc
index 8392d159f2..2f0067c5b6 100644
--- a/.envrc
+++ b/.envrc
@@ -1 +1 @@
-use flake
\ No newline at end of file
+use flake ${PLACEHOLDER_DEVELOP_DERIVATION:-.}
diff --git a/.gitignore b/.gitignore
index 1230c719f2..06953e78cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -347,6 +347,7 @@ modules.xml
 ### CMake ###
 CMakeLists.txt.user
 CMakeCache.txt
+CMakeUserPresets.json
 CMakeFiles
 CMakeScripts
 Testing
@@ -640,3 +641,9 @@ callgrind.*
 
 .ycm_extra_config.py
 .color_coded
+
+# VSCode configuration
+.vscode
+
+# direnv outputs
+.direnv
diff --git a/flake.nix b/flake.nix
index 08ec737c75..33cfeeafe5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -109,7 +109,19 @@
             parallel_crypto3_tets = true;
             crypto3_bechmarks = true;
             parallel_crypto3_bechmarks = true;
-            });
+          });
+
+          develop-clang = (pkgs.callPackage ./proof-producer.nix {
+            stdenv = pkgs.llvmPackages_19.stdenv;
+            enableDebug = true;
+            runTests = true;
+            sanitize = true;
+            crypto3_tests = true;
+            parallel_crypto3_tets = true;
+            crypto3_bechmarks = true;
+            parallel_crypto3_bechmarks = true;
+          });
+
           # The "all" package will build all packages. Convenient for CI,
           # so that "nix build" will check that all packages are correct.
           # The packages that have no changes will not be rebuilt, and instead