diff --git a/.envrc b/.envrc
index 10eba288e..6cc94f514 100644
--- a/.envrc
+++ b/.envrc
@@ -1,5 +1,6 @@
 # If we are a computer with nix-shell available, then use that to setup
 # the build environment with exactly what we need.
-if has nix-shell; then
-  use nix
+if has nix; then
+  # Can add ". --impure" if we ever need the parent shell environment. We might.
+  use flake
 fi
diff --git a/.gitignore b/.gitignore
index 57e29445e..d55a6320c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+.direnv/
 zig-cache/
 zig-out/
 /result*
diff --git a/nix/devshell.nix b/nix/devshell.nix
index beba86051..7ccc15a03 100644
--- a/nix/devshell.nix
+++ b/nix/devshell.nix
@@ -24,14 +24,18 @@
   name = "ghostty";
 
   nativeBuildInputs = [
-    gdb
+    # For builds
     pkg-config
     scdoc
-    tracy
     zig
 
+    # Utilities
     glxinfo
     vttest
+
+    # Testing
+    gdb
+    tracy
   ];
 
   buildInputs = [
@@ -39,11 +43,6 @@
   ] ++ lib.optionals stdenv.isLinux [
     libGL
 
-    fontconfig
-    freetype
-    libpng
-    bzip2
-
     libX11
     libXcursor
     libXext