some pixi conveniences

eteq · eteq · commit b2aec62b5930 · 2026-01-02T17:22:09.000-05:00
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,2 @@
+# SCM syntax highlighting & preventing 3-way merges
+pixi.lock merge=binary linguist-language=YAML linguist-generated=true
diff --git a/.gitignore b/.gitignore
@@ -58,3 +58,8 @@ distribute-*.tar.gz
 
 # Mac OSX
 .DS_Store
+# pixi environments
+.pixi/*
+!.pixi/config.toml
+
+pixi.lock

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+# SCM syntax highlighting & preventing 3-way merges`
	`2`	`+pixi.lock merge=binary linguist-language=YAML linguist-generated=true`