nix/model: include .kicad_pro to get model paths

2 files changed, 10 insertions, 4 deletions

diff --git a/clef/nix/model.nix b/clef/nix/model.nix
index 04bf1b1..da8be82 100644
--- a/clef/nix/model.nix
+++ b/clef/nix/model.nix
@@ -27,10 +27,15 @@ in runCommand "${boardName}.model" {
 
     include = [
       (nix-filter.matchExt "kicad_pcb")
+      (nix-filter.matchExt "kicad_pro")
 
       (nix-filter.matchExt "stp")
+      (nix-filter.matchExt "STP")
       (nix-filter.matchExt "step")
+      (nix-filter.matchExt "STEP")
       (nix-filter.matchExt "wrl")
+
+      (_args: path: type: type == "directory")
     ];
   };
 
@@ -43,10 +48,11 @@ in runCommand "${boardName}.model" {
   export HOME=$(mktemp -d)
 
   echo "board: '${boardName}'" >&2
+  echo "KICAD8_3DMODEL_DIR: $KICAD8_3DMODEL_DIR" >&2
 
   mkdir -p $out/${sharePath}
-  cd "$out/${sharePath}"
+  cd "$src"
 
-  kicad-cli pcb export step --subst-models --no-dnp ${tracksArg} ${zonesArg} "$src/${pcb_path}" -o "${boardName}.step"
-  kicad-cli pcb export glb  --subst-models --no-dnp ${tracksArg} ${zonesArg} "$src/${pcb_path}" -o "${boardName}.glb"
+  kicad-cli pcb export step --subst-models --no-dnp ${tracksArg} ${zonesArg} "${pcb_path}" -o "$out/${sharePath}/${boardName}.step"
+  kicad-cli pcb export glb  --subst-models --no-dnp ${tracksArg} ${zonesArg} "${pcb_path}" -o "$out/${sharePath}/${boardName}.glb"
 ''
diff --git a/flake.lock b/flake.lock
index 2785693..c395ed8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -30,7 +30,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-pkNrmtKW8t9a0kcBS7aoSoo3dk7+YO1roIQJvsnO8mQ=",
+        "narHash": "sha256-LNZY8xQ0ooccTQj3z8cOcKOimnlOpYumZRCflzHMpvI=",
         "path": "./clef",
         "type": "path"
       },