diff --git a/.envrc b/.envrc
index 82b2b9e..cc5c18b 100644
--- a/.envrc
+++ b/.envrc
@@ -1,9 +1,12 @@
 #!/usr/bin/env bash
-# the shebang is ignored, but nice for editors
 
-if type -P lorri &>/dev/null; then
-  eval "$(lorri direnv)"
-else
-  echo 'while direnv evaluated .envrc, could not find the command "lorri" [https://github.com/nix-community/lorri]'
-  use nix
-fi
+export DIRENV_WARN_TIMEOUT=20s
+
+eval "$(devenv direnvrc)"
+
+# `use devenv` supports the same options as the `devenv shell` command.
+#
+# To silence all output, use `--quiet`.
+#
+# Example usage: use devenv --quiet --impure --option services.postgres.enable:bool true
+use devenv
diff --git a/.gitignore b/.gitignore
index eb5a316..cbec1d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,12 @@
 target
+
+# Devenv
+.devenv*
+devenv.local.nix
+devenv.local.yaml
+
+# direnv
+.direnv
+
+# pre-commit
+.pre-commit-config.yaml
diff --git a/devenv.lock b/devenv.lock
new file mode 100644
index 0000000..dfdab03
--- /dev/null
+++ b/devenv.lock
@@ -0,0 +1,143 @@
+{
+  "nodes": {
+    "devenv": {
+      "locked": {
+        "dir": "src/modules",
+        "lastModified": 1770399425,
+        "owner": "cachix",
+        "repo": "devenv",
+        "rev": "0f006b2e9f591cc44cf219048b5e33793530403b",
+        "type": "github"
+      },
+      "original": {
+        "dir": "src/modules",
+        "owner": "cachix",
+        "repo": "devenv",
+        "type": "github"
+      }
+    },
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1767039857,
+        "owner": "NixOS",
+        "repo": "flake-compat",
+        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "git-hooks": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "gitignore": "gitignore",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1769939035,
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "a8ca480175326551d6c4121498316261cbb5b260",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
+    "gitignore": {
+      "inputs": {
+        "nixpkgs": [
+          "git-hooks",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1762808025,
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "rev": "cb5e3fdca1de58ccbc3ef53de65bd372b48f567c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "inputs": {
+        "nixpkgs-src": "nixpkgs-src"
+      },
+      "locked": {
+        "lastModified": 1770434727,
+        "owner": "cachix",
+        "repo": "devenv-nixpkgs",
+        "rev": "8430f16a39c27bdeef236f1eeb56f0b51b33d348",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "ref": "rolling",
+        "repo": "devenv-nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1769922788,
+        "narHash": "sha256-H3AfG4ObMDTkTJYkd8cz1/RbY9LatN5Mk4UF48VuSXc=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "207d15f1a6603226e1e223dc79ac29c7846da32e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "devenv": "devenv",
+        "git-hooks": "git-hooks",
+        "nixpkgs": "nixpkgs",
+        "pre-commit-hooks": [
+          "git-hooks"
+        ],
+        "rust-overlay": "rust-overlay"
+      }
+    },
+    "rust-overlay": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1770520253,
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "ebb8a141f60bb0ec33836333e0ca7928a072217f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/devenv.nix b/devenv.nix
new file mode 100644
index 0000000..f7dde90
--- /dev/null
+++ b/devenv.nix
@@ -0,0 +1,57 @@
+{
+    pkgs,
+    lib,
+    config,
+    inputs,
+    ...
+}: rec {
+    # https://devenv.sh/packages/
+    packages = with pkgs; [
+        pkg-config
+
+        # spacetimedb
+        openssl
+        binaryen
+
+        # bevy Linux
+        # Audio (Linux only)
+        alsa-lib
+        # Cross Platform 3D Graphics API
+        vulkan-loader
+        # For debugging around vulkan
+        vulkan-tools
+        # Other dependencies
+        libudev-zero
+        xorg.libX11
+        xorg.libXcursor
+        xorg.libXi
+        xorg.libXrandr
+        libxkbcommon
+        wayland
+    ];
+    env.LD_LIBRARY_PATH = lib.makeLibraryPath packages;
+    env.RUST_LOG = "jong=trace";
+
+    # https://devenv.sh/languages/
+    languages.rust = {
+        enable = true;
+        channel = "nightly";
+        version = "latest";
+        targets = ["x86_64-unknown-linux-gnu" "wasm32-unknown-unknown"];
+        components = ["rust-src" "rust-docs" "rustc-codegen-cranelift" "rust-analyzer" "rustfmt"];
+    };
+
+    # https://devenv.sh/processes/
+    processes.spacetimedb_start.exec = "spacetime start";
+    processes.spacetimedb_generate_bindings = {
+        exec = "spacetime dev --module-bindings-path module_bindings jongline";
+    };
+
+    # https://devenv.sh/services/
+    # https://devenv.sh/scripts/
+    # https://devenv.sh/basics/
+    # https://devenv.sh/tasks/
+    # https://devenv.sh/tests/
+    # https://devenv.sh/git-hooks/
+    # See full reference at https://devenv.sh/reference/options/
+}
diff --git a/devenv.yaml b/devenv.yaml
new file mode 100644
index 0000000..37e8589
--- /dev/null
+++ b/devenv.yaml
@@ -0,0 +1,8 @@
+inputs:
+  nixpkgs:
+    url: github:cachix/devenv-nixpkgs/rolling
+  rust-overlay:
+    url: github:oxalica/rust-overlay
+    inputs:
+      nixpkgs:
+        follows: nixpkgs
diff --git a/justfile b/justfile
index f8f62e9..3950586 100644
--- a/justfile
+++ b/justfile
@@ -11,7 +11,7 @@ run-tui:
 
 update:
     cargo update
-    nix flake update
+    devenv update
 
 spacetime:
-    spacetime dev --module-bindings-path module_bindings fantastic-key-0909
+    devenv up
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
deleted file mode 100644
index 5d56faf..0000000
--- a/rust-toolchain.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-[toolchain]
-channel = "nightly"