diff --git a/modules/hardware/x86_64.nix b/modules/hardware/x86_64.nix
index 1eee10e75..f584d5e65 100644
--- a/modules/hardware/x86_64.nix
+++ b/modules/hardware/x86_64.nix
@@ -10,7 +10,10 @@ with lib;
     ];
     boot.initrd.kernelModules = [ ];
     boot.initrd.supportedFilesystems = [ "ext4" "btrfs" "ext2" "ext3" "vfat" ];
-    # find more of these with sensors-detect
+    # useful emergency utils
+    boot.initrd.extraUtilsCommands = ''
+      copy_bin_and_libs ${pkgs.btrfs-progs}/bin/btrfstune
+    '';
     boot.kernelModules = [
       "coretemp"
       "kvm-intel"
diff --git a/modules/universal/home-manager.nix b/modules/universal/home-manager.nix
index 748349bda..f84e55605 100644
--- a/modules/universal/home-manager.nix
+++ b/modules/universal/home-manager.nix
@@ -206,6 +206,7 @@ in
         dig
         cryptsetup
         duplicity
+        efibootmgr
         fatresize
         fd
         file