diff --git a/flake.nix b/flake.nix
index acabedb..2feaac4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -76,24 +76,7 @@
 
         checks = import ./checks.nix { inherit system; inherit (inputs) hooks; };
 
-        devShells = {
-          default = pkgs.mkShell {
-            inherit (self'.checks.pre-commit-check) shellHook;
-            buildInputs = with pkgs; [
-              bashInteractive
-              curl
-              git
-              gnutar
-              gzip
-              inject
-              inject-darwin
-              (inputs.nixvimunstable.legacyPackages.${system}.makeNixvim (import ./home/modules/baseline/vim/config.nix { inherit pkgs; inherit (pkgs) lib; }))
-              self'.checks.pre-commit-check.enabledPackages
-              tmux
-              xonsh
-            ];
-          };
-        };
+        devShells = import ./shells.nix { inherit self' pkgs; inherit (inputs) nixvimunstable; };
 
         packages = rec {
           default = iso;
diff --git a/shells.nix b/shells.nix
new file mode 100644
index 0000000..58d1798
--- /dev/null
+++ b/shells.nix
@@ -0,0 +1,19 @@
+{ self', pkgs, nixvimunstable, ... }:
+{
+  default = pkgs.mkShell {
+    inherit (self'.checks.pre-commit-check) shellHook;
+    buildInputs = with pkgs; [
+      bashInteractive
+      curl
+      git
+      gnutar
+      gzip
+      inject
+      inject-darwin
+      (nixvimunstable.legacyPackages.${system}.makeNixvim (import ./home/modules/baseline/vim/config.nix { inherit pkgs; inherit (pkgs) lib; }))
+      self'.checks.pre-commit-check.enabledPackages
+      tmux
+      xonsh
+    ];
+  };
+}