diff --git a/hosts/skadi/configuration.nix b/hosts/skadi/configuration.nix
index 4eb69a1..1d8c3c6 100644
--- a/hosts/skadi/configuration.nix
+++ b/hosts/skadi/configuration.nix
@@ -67,9 +67,6 @@
   # 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 f796ea0..d04d1ff 100644
--- a/modules/linux/home-manager/desktop.nix
+++ b/modules/linux/home-manager/desktop.nix
@@ -36,18 +36,5 @@
 
     # 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";
-        };
-      };
-    };
   };
 }
diff --git a/modules/linux/home-manager/hyprland.nix b/modules/linux/home-manager/hyprland.nix
index db97a57..f81348c 100644
--- a/modules/linux/home-manager/hyprland.nix
+++ b/modules/linux/home-manager/hyprland.nix
@@ -175,9 +175,8 @@ in {
         };
 
         input = {
-          kb_layout = "hr";
-          kb_variant = "us";
-          # kb_options = "";
+          kb_layout = "us,hr";
+          kb_options = "grp:alt_space_toggle";
           accel_profile = "flat";
         };