diff --git a/modules/system/default.nix b/modules/system/default.nix
index d83b4ce..502a87d 100644
--- a/modules/system/default.nix
+++ b/modules/system/default.nix
@@ -15,6 +15,11 @@
     ./virt.nix
   ];
 
+  # Auto-mount new devices
+  services.udev.extraRules = ''
+     ACTION=="add", SUBSYSTEMS=="usb", SUBSYSTEM=="block", ENV{ID_FS_USAGE}=="filesystem", RUN{program}+="${pkgs.systemd}/bin/systemd-mount --no-block --automount=yes --collect $devnode /media"
+  '';
+
   services.xserver.displayManager.gdm.enable = true;
 
   # Wayland in electron