NVIDIA · cpcloud · Oct 2, 2025 · Oct 2, 2025 · Oct 2, 2025 · Oct 2, 2025
diff --git a/.gitattributes b/.gitattributes
@@ -7,3 +7,5 @@ cuda/_version.py export-subst
 *.hpp binary
 # git should not convert line endings in PNG files
 *.png binary
+# SCM syntax highlighting & preventing 3-way merges
+pixi.lock merge=binary linguist-language=YAML linguist-generated=true
diff --git a/.gitignore b/.gitignore
@@ -182,3 +182,7 @@ cython_debug/
 
 # Dont ignore
 !.github/actions/build/
+# pixi environments
+.pixi/
+!.pixi/config.toml
+.gdb_history
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -24,6 +24,7 @@ repos:
   - repo: local
     hooks:
       - id: check-spdx
+        exclude: 'pixi\.lock$'
         name: Check SPDX Headers
         entry: python ./toolshed/check_spdx.py
         language: python
@@ -52,7 +53,7 @@ repos:
     - id: check-yaml
     - id: debug-statements
     - id: end-of-file-fixer
-      exclude: &gen_exclude '^(?:cuda_bindings/cuda/bindings/.*\.in?|cuda_bindings/docs/source/module/.*\.rst?)$'
+      exclude: &gen_exclude '^(?:cuda_bindings/cuda/bindings/.*\.in?|cuda_bindings/docs/source/module/.*\.rst?|pixi\.lock)$'
     - id: mixed-line-ending
     - id: trailing-whitespace
       exclude: *gen_exclude