diff --git a/flake-modules/dev/devshell.nix b/flake-modules/dev/devshell.nix
index 40794509..d1ef469c 100644
--- a/flake-modules/dev/devshell.nix
+++ b/flake-modules/dev/devshell.nix
@@ -1,15 +1,16 @@
-{ inputs, ... }:
+{ lib, inputs, ... }:
 {
-  imports = [ inputs.devshell.flakeModule ];
+  imports = lib.optional (inputs.devshell ? flakeModule) inputs.devshell.flakeModule;
 
   perSystem =
     {
+      lib,
       pkgs,
       config,
       system,
       ...
     }:
-    {
+    lib.optionalAttrs (inputs.devshell ? flakeModule) {
       devshells.default = {
         devshell.startup.pre-commit.text = config.pre-commit.installationScript;