diff --git a/hosts/skadi/configuration.nix b/hosts/skadi/configuration.nix
index 1d8c3c6..4eb69a1 100644
--- a/hosts/skadi/configuration.nix
+++ b/hosts/skadi/configuration.nix
@@ -67,6 +67,9 @@
   # Setup profiles sync daemon
   services.psd.enable = true;
 
+  # Setup automatic usb device mounting
+  services.udisks2.enable = true;
+
   # Get nicer hostname
   networking.hostName = "skadi"; # Define your hostname.
 
diff --git a/modules/linux/home-manager/desktop.nix b/modules/linux/home-manager/desktop.nix
index d04d1ff..f796ea0 100644
--- a/modules/linux/home-manager/desktop.nix
+++ b/modules/linux/home-manager/desktop.nix
@@ -36,5 +36,18 @@
 
     # Install imv
     programs.imv.enable = true;
+
+    # Setup udisk for automatic mounting of usb devices
+    services.udiskie = {
+      enable = true;
+      settings = {
+        # workaround for
+        # https://github.com/nix-community/home-manager/issues/632
+        program_options = {
+          # replace with your favorite file manager
+          file_manager = "${pkgs.kitty}/bin/kitty -e yazi";
+        };
+      };
+    };
   };
 }