Merge pull request #22 from Cjen1/trackball

Add trackball thumb cluster. Interim commit, needs a few mods for naming and handedness.
joshreve · Aug 20, 2021 · 0df44c2 · 0df44c2
2 parents b9c0013 + 8f7580b
commit 0df44c2
Show file tree

Hide file tree

Showing 5 changed files with 6,186 additions and 5 deletions.
diff --git a/.envrc b/.envrc
@@ -0,0 +1 @@
+eval "$(lorri direnv)"
diff --git a/Makefile b/Makefile
@@ -54,7 +54,7 @@ build-models: check-requirements ## Build models.
 
 
 shell: check-requirements ## Open an interactive shell inside a container.
-	@${DOCKER_CMD} run --rm -it --name DM-shell -v "src:/app/src" -v "things:/app/things" dactyl-keyboard bash && \
+	@${DOCKER_CMD} run --rm -it --name DM-shell -v ${source_dir}:/app/src -v ${artifact_dir}:/app/things dactyl-keyboard bash && \
 	echo "\nBye!"
 .PHONY: shell
 
diff --git a/shell.nix b/shell.nix
@@ -0,0 +1,8 @@
+{ pkgs ? import <nixpkgs> {} }:
+
+pkgs.mkShell {
+  buildInputs = [
+    pkgs.cmake
+    pkgs.cq-editor
+  ];
+}