diff --git a/.gitattributes b/.gitattributes
index 07fe41c..d1a890e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,4 @@
 # GitHub syntax highlighting
 pixi.lock linguist-language=YAML linguist-generated=true
+# SCM syntax highlighting & preventing 3-way merges
+pixi.lock merge=binary linguist-language=YAML linguist-generated=true -diff
diff --git a/.gitignore b/.gitignore
index c0e496a..8c4ae2d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -130,4 +130,6 @@ cython_debug/
 .DS_Store
 
 # pixi environments
-.pixi
\ No newline at end of file
+.pixi
+.pixi/*
+!.pixi/config.toml
diff --git a/pyproject.toml b/pyproject.toml
index d420a06..cda0e04 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -72,3 +72,18 @@ packages = ["xee"]
 
 [tool.setuptools_scm]
 fallback_version = "9999"
+
+[tool.pixi.workspace]
+channels = ["conda-forge"]
+platforms = ["linux-64", "osx-64", "osx-arm64", "win-64"]
+
+[tool.pixi.pypi-dependencies]
+xee = { path = ".", editable = true }
+
+[tool.pixi.environments]
+default = { solve-group = "default" }
+dataflow = { features = ["dataflow"], solve-group = "default" }
+examples = { features = ["examples", "dataflow"], solve-group = "default" }
+tests = { features = ["tests"], solve-group = "default" }
+
+[tool.pixi.tasks]