M .gitignore → .gitignore

@@ -50,4 +50,10 @@ .tmp_versions/
 modules.order
 Module.symvers
 Mkfile.old
-dkms.conf+dkms.conf
+
+# Build Artifacts
+.cache/
+build/
+flake.lock
+compile_commands.json

M .gitmodules → .gitmodules

@@ -4,6 +4,6 @@ url = https://github.com/pq-code-package/mldsa-native.git
 [submodule "contrib/mlkem-native"]
 	path = contrib/mlkem-native
 	url = https://github.com/pq-code-package/mlkem-native.git
-[submodule "contrib/TinyCrypT"]
-	path = contrib/TinyCrypT
+[submodule "subprojects/TinyCrypT"]
+	path = subprojects/TinyCrypT
 	url = https://gitea.eyes-like-fire.org/juniper/TinyCrypT.git

M flake.nix → flake.nix

@@ -24,20 +24,23 @@ };
       aphrodite_shl = pkgs.mkShell {
         name = "circe-tooling-env-aphrodite";
         packages = with pkgs; [
-          ninja
-          meson
+          muon
+          samurai
+          just
           gcc
           clang-tools
           valgrind
           bear
           tokei
         ];
+        NIX_ENFORCE_NO_NATIVE = 0;
       };
       teiresia_shl = pkgs.mkShell {
         name = "circe-tooling-env-teiresia";
         packages = with pkgs; [
-          ninja
-          meson
+          muon
+          samurai
+          just
           pkgsCross.aarch64-multiplatform-musl.gcc
           clang-tools
           valgrind
@@ -48,8 +51,9 @@ };
       demeter_shl = pkgs.mkShell {
         name = "circe-tooling-env-demeter";
         packages = with pkgs; [
-          ninja
-          meson
+          muon
+          samurai
+          just
           pkgsCross.mips64el-linux-gnuabin32.gcc
           clang-tools
           valgrind
@@ -60,8 +64,9 @@ };
       persephone_shl = pkgs.mkShell {
         name = "circe-tooling-env-persephone";
         packages = with pkgs-persephone; [
-          ninja
-          meson
+          muon
+          samurai
+          just
           esp-idf-xtensa
           qemu-esp32
           clang-tools