diff --git a/modules/home-manager/nvim/treesitter/default.nix b/modules/home-manager/nvim/treesitter/default.nix
index a92d22a..080fbd2 100644
--- a/modules/home-manager/nvim/treesitter/default.nix
+++ b/modules/home-manager/nvim/treesitter/default.nix
@@ -28,15 +28,6 @@
           })
         '';
         keymaps = [
-          {
-            action = ":TSContextToggle<CR>";
-            key = "<leader>x";
-            mode = "n";
-            options = {
-              silent = true;
-              desc = "tree context toggle";
-            };
-          }
           {
             action = ":TSJToggle<CR>";
             key = "<leader>j";
diff --git a/packages/aarch64-iso.nix b/packages/aarch64-iso.nix
index c145555..1b59e18 100644
--- a/packages/aarch64-iso.nix
+++ b/packages/aarch64-iso.nix
@@ -47,7 +47,7 @@
       users.users.${config.host.user} = {
         packages = with pkgs; [
           gparted
-          neovim
+          firefox
         ];
       };
 
@@ -116,6 +116,17 @@
       # plenty of free memory.
       boot.kernel.sysctl."vm.overcommit_memory" = "1";
 
+      # To speed up installation a little bit, include the complete
+      # stdenv in the Nix store on the CD.
+      system.extraDependencies = with pkgs; [
+        stdenv
+        stdenvNoCC # for runCommand
+        busybox
+        jq # for closureInfo
+        # For boot.initrd.systemd
+        makeInitrdNGTool
+      ];
+
       # Show all debug messages from the kernel but don't log refused packets
       # because we have the firewall enabled. This makes installs from the
       # console less cumbersome if the machine has a public IP.