diff --git a/.envrc b/.envrc
index 7ac50c1..95ed6fb 100644
--- a/.envrc
+++ b/.envrc
@@ -5,5 +5,6 @@ fi
 use flake
 
 watch_file ./flake/checks.nix
+watch_file ./flake/dev-shells.nix
 
 eval "$shellHooks"
diff --git a/flake.nix b/flake.nix
index 3545b66..49d5583 100644
--- a/flake.nix
+++ b/flake.nix
@@ -122,18 +122,7 @@
 
         checks = import ./flake/checks.nix inputs system;
 
-        devShells = {
-          default = pkgs.mkShell {
-            name = "NixOS-config";
-
-            nativeBuildInputs = with pkgs; [
-              gitAndTools.pre-commit
-              nixpkgs-fmt
-            ];
-
-            inherit (self.checks.${system}.pre-commit) shellHook;
-          };
-        };
+        devShells = import ./flake/dev-shells.nix inputs system;
 
         packages =
           let
diff --git a/flake/dev-shells.nix b/flake/dev-shells.nix
new file mode 100644
index 0000000..064f57d
--- /dev/null
+++ b/flake/dev-shells.nix
@@ -0,0 +1,17 @@
+{ self, nixpkgs, ... }:
+system:
+let
+  pkgs = nixpkgs.legacyPackages.${system};
+in
+{
+  default = pkgs.mkShell {
+    name = "NixOS-config";
+
+    nativeBuildInputs = with pkgs; [
+      gitAndTools.pre-commit
+      nixpkgs-fmt
+    ];
+
+    inherit (self.checks.${system}.pre-commit) shellHook;
+  };
+}