diff --git a/hosts/steamdeck.cloonar.com/configuration.nix b/hosts/steamdeck.cloonar.com/configuration.nix
index 5a3c3ee..277c41a 100644
--- a/hosts/steamdeck.cloonar.com/configuration.nix
+++ b/hosts/steamdeck.cloonar.com/configuration.nix
@@ -83,14 +83,15 @@
     LC_TIME = "de_AT.UTF-8";
   };
 
+  environment.systemPackages = with pkgs; [
+    ykfde
+    firefox
+  ];
+
   users.users.dominik = {
     isNormalUser = true;
     description = "Dominik Polakovics";
     extraGroups = [ "networkmanager" "wheel" ];
-    packages = with pkgs; [
-      firefox
-      ykfde
-    ];
   };
 
   services.openssh.enable = true;
diff --git a/hosts/steamdeck.cloonar.com/hardware-configuration.nix b/hosts/steamdeck.cloonar.com/hardware-configuration.nix
index 9af89e9..1512e41 100644
--- a/hosts/steamdeck.cloonar.com/hardware-configuration.nix
+++ b/hosts/steamdeck.cloonar.com/hardware-configuration.nix
@@ -16,6 +16,7 @@
     "mmc-block"
   ];
   boot.initrd.kernelModules = [
+    "usbcore"
     "usbhid"
     "hid-generic" "hid-lenovo" "hid-apple" "hid-roccat"
     "hid-logitech-hidpp" "hid-logitech_dj" "hid-microsoft" "hid-cherry"
diff --git a/utils/pkgs/ykfde/scripts/ykfde_enroll b/utils/pkgs/ykfde/scripts/ykfde_enroll
index 6da32f2..2493b83 100755
--- a/utils/pkgs/ykfde/scripts/ykfde_enroll
+++ b/utils/pkgs/ykfde/scripts/ykfde_enroll
@@ -17,7 +17,7 @@ YKFDE_STORAGE=/boot/crypt-storage/default
 
 
 YKFDE_SLOT_CHECK="$(ykinfo -q -"$YKFDE_SLOT")"
-[ "$DBG" ] && printf '%s\n' " > YubiKey slot status 'ykinfo -q -$YKFDE_SLOT': $YKFDE_SLOT_CHECK"
+printf '%s\n' " > YubiKey slot status 'ykinfo -q -$YKFDE_SLOT': $YKFDE_SLOT_CHECK"
 
 if [ "$YKFDE_SLOT_CHECK" != 1 ]; then
   printf '%s\n' "ERROR: Chosen YubiKey slot '$YKFDE_SLOT' isn't configured. Please choose slot configured for 'HMAC-SHA1 Challenge-Response' mode in '/etc/ykfde.conf'"
@@ -26,7 +26,7 @@ fi
 
 YKFDE_SALT="$(dd if=/dev/random bs=1 count=$YKFDE_SALT_LENGTH 2>/dev/null | rbtohex)"
 YKFDE_CHALLENGE="$(echo -n $salt | openssl dgst -binary -sha512 | rbtohex)"
-YKFDE_RESPONSE="$(ykchalresp -2 -x $YKFDE_CHALLANGE 2>/dev/null)"
+YKFDE_RESPONSE="$(ykchalresp -2 -x $YKFDE_CHALLENGE 2>/dev/null)"
 YKFDE_K_LUKS ="$(echo | pbkdf2-sha512 $(($YKFDE_KEY_LENGTH / 8)) $YKFDE_ITERATIONS $YKFDE_RESPONSE | rbtohex)"
 mkdir -p "$(dirname $YKFDE_STORAGE)"
 echo -ne "$YKFDE_SALT\n$YKFDE_ITERATIONS" > $YKFDE_STORAGE