diff --git a/.gitignore b/.gitignore
index e0dfc13d37..de15d0abc3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+/.direnv
 .idea
 **/target
 **/cargo-target
diff --git a/flake.lock b/flake.lock
new file mode 100644
index 0000000000..ca353b3445
--- /dev/null
+++ b/flake.lock
@@ -0,0 +1,27 @@
+{
+  "nodes": {
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1719690277,
+        "narHash": "sha256-0xSej1g7eP2kaUF+JQp8jdyNmpmCJKRpO12mKl/36Kc=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "2741b4b489b55df32afac57bc4bfd220e8bf617e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/flake.nix b/flake.nix
new file mode 100644
index 0000000000..f24dd9cf30
--- /dev/null
+++ b/flake.nix
@@ -0,0 +1,31 @@
+{
+  description = "High-performance, multiplayer code editor from the creators of Atom and Tree-sitter";
+
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs?ref=nixos-unstable";
+  };
+
+  outputs =
+    { self, nixpkgs }:
+    let
+      inherit (self) outputs;
+      systems = [
+        "aarch64-linux"
+        "x86_64-linux"
+        "aarch64-darwin"
+        "x86_64-darwin"
+      ];
+      forAllSystems = nixpkgs.lib.genAttrs systems;
+    in
+    {
+      devShells = forAllSystems (
+        system:
+        let
+          pkgs = import nixpkgs { inherit system; };
+        in
+        {
+          default = import ./shell.nix { inherit pkgs; };
+        }
+      );
+    };
+}
diff --git a/shell.nix b/shell.nix
new file mode 100644
index 0000000000..be2dcb2f88
--- /dev/null
+++ b/shell.nix
@@ -0,0 +1,56 @@
+{
+  pkgs ? import <nixpkgs> { },
+}:
+
+let
+  stdenv = pkgs.stdenvAdapters.useMoldLinker pkgs.llvmPackages_18.stdenv;
+in
+if pkgs.stdenv.isDarwin then
+  # See https://github.com/NixOS/nixpkgs/issues/320084
+  throw "zed: nix dev-shell isn't supported on darwin yet."
+else
+  (pkgs.mkShell.override { inherit stdenv; }) rec {
+    nativeBuildInputs = with pkgs; [
+      copyDesktopItems
+      curl
+      perl
+      pkg-config
+      protobuf
+      rustPlatform.bindgenHook
+    ];
+
+    buildInputs = with pkgs; [
+      curl
+      fontconfig
+      freetype
+      libgit2
+      openssl
+      sqlite
+      zlib
+      zstd
+
+      alsa-lib
+      libxkbcommon
+      wayland
+      xorg.libxcb
+    ];
+
+    env = {
+      LD_LIBRARY_PATH =
+        with pkgs;
+        lib.makeLibraryPath (
+          buildInputs
+          ++ [
+            stdenv.cc.cc.lib
+            vulkan-loader
+          ]
+        );
+      ZSTD_SYS_USE_PKG_CONFIG = true;
+      FONTCONFIG_FILE = pkgs.makeFontsConf {
+        fontDirectories = [
+          "assets/fonts/zed-mono"
+          "assets/fonts/zed-sans"
+        ];
+      };
+    };
+  }