diff --git a/shell.nix b/shell.nix
index 3edc710..3c53621 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,6 +1,18 @@
-with import <nixpkgs> {};
-mkShell {
-  nativeBuildInputs = [ grub2_efi inkscape imagemagick ];
-  dejavu = dejavu_fonts;
-  __strictDeps = true;
-}
+{ pkgs ? import <nixpkgs> {} }:
+
+let
+  default = import ./. { inherit pkgs; };
+in
+pkgs.callPackage (
+  { mkShell
+  , dejavu_fonts
+  }:
+  mkShell {
+    nativeBuildInputs = []
+      ++ default.bootloader.nativeBuildInputs
+      ++ default.icons.nativeBuildInputs
+    ;
+    dejavu = dejavu_fonts;
+    __strictDeps = true;
+  }
+) {}