diff --git a/.envrc b/.envrc
index 1d953f4b..261d6300 100644
--- a/.envrc
+++ b/.envrc
@@ -1 +1,5 @@
-use nix
+# reload when these files change
+watch_file flake.nix
+watch_file flake.lock
+# load the flake devShell
+eval "$(nix print-dev-env)"
diff --git a/flake.nix b/flake.nix
index 7c4fde4f..f6a54e91 100644
--- a/flake.nix
+++ b/flake.nix
@@ -40,6 +40,8 @@
           import ./hosts (inputs // { inherit system pkgs unstablePkgs; });
       in configs;
 
+      devShell."${system}" = import ./shell.nix { inherit pkgs; };
+
       overlay = import ./pkgs;
 
       overlays = let