diff --git a/modules/misc/cli-tools.nix b/modules/misc/cli-tools.nix
index 918e17c..9d6c05a 100644
--- a/modules/misc/cli-tools.nix
+++ b/modules/misc/cli-tools.nix
@@ -80,6 +80,7 @@ in {
       kop-newproject # creates a shell.nix and .envrc
       nix-tree # show nix derivations
       binwalk # show what's inside a binary
+      iotop
     ];
   };
 }
diff --git a/modules/misc/faster-boot-time.nix b/modules/misc/faster-boot-time.nix
new file mode 100644
index 0000000..268f41c
--- /dev/null
+++ b/modules/misc/faster-boot-time.nix
@@ -0,0 +1,14 @@
+{ lib, pkgs,  config, ... }: {
+  # before: Startup finished in 18.830s (firmware) + 5.844s (loader) + 4.422s (kernel) + 7.616s (userspace) = 36.713s 
+  # after: Startup finished in 14.115s (firmware) + 789ms (loader) + 4.312s (kernel) + 5.777s (userspace) = 24.995s 
+  systemd = {
+    targets.network-online.wantedBy =
+      lib.mkForce [ ]; # Normally ["multi-user.target"]
+    services.NetworkManager-wait-online.wantedBy =
+      lib.mkForce [ ]; # Normally ["network-online.target"]
+  };
+  # mash spacebar to still be able to select a different boot option
+  boot.loader.timeout = 0;
+
+  virtualisation.docker.enableOnBoot = false;
+}
diff --git a/systems/pc/configuration.nix b/systems/pc/configuration.nix
index de2408f..8503df4 100644
--- a/systems/pc/configuration.nix
+++ b/systems/pc/configuration.nix
@@ -13,6 +13,7 @@
     ../../modules/support/ntfs.nix
     ../../modules/fh/writing.nix
     ../../modules/work/vpn.nix
+    ../../modules/misc/faster-boot-time.nix
   ];
 
   custom = {