diff --git a/modules/storage/default.nix b/modules/storage/default.nix
index 69efee18..f3d1b09a 100644
--- a/modules/storage/default.nix
+++ b/modules/storage/default.nix
@@ -1,4 +1,10 @@
+{ lib, config, ... }:
+
 {
-  services.udisks2.enable = true;
-  boot.zfs.forceImportRoot = false;
+  options.storage.enable = lib.mkEnableOption "storage";
+
+  config = lib.mkIf config.storage.enable {
+    services.udisks2.enable = true;
+    boot.zfs.forceImportRoot = false;
+  };
 }