diff --git a/home/.config/swaylock/config b/home/.config/swaylock/config
index 5033250..5c860f8 100644
--- a/home/.config/swaylock/config
+++ b/home/.config/swaylock/config
@@ -1,4 +1,3 @@
-ignore-empty-password
 daemonize
 indicator
 clock
diff --git a/nixos/auto-upgrade.nix b/nixos/auto-upgrade.nix
index 2650dda..f23cd1d 100644
--- a/nixos/auto-upgrade.nix
+++ b/nixos/auto-upgrade.nix
@@ -10,7 +10,7 @@
     operation = "switch"; # If you don't want to apply updates immediately, only after rebooting, use `boot` option in this case
     flake = "/etc/nixos";
     flags = [ "--update-input" "nixpkgs" "--update-input" "rust-overlay" "--commit-lock-file" ];
-    dates = "daily";
+    dates = "weekly";
     # channel = "https://nixos.org/channels/nixos-unstable";
   };
 }
diff --git a/nixos/bootloader.nix b/nixos/bootloader.nix
index f16adcf..59d4a32 100644
--- a/nixos/bootloader.nix
+++ b/nixos/bootloader.nix
@@ -4,7 +4,6 @@
   # Bootloader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
-  boot.loader.efi.efiSysMountPoint = "/boot";
   boot.loader.timeout = 2;
   boot.initrd.enable = true;
   boot.initrd.systemd.enable = true;
diff --git a/nixos/gc.nix b/nixos/gc.nix
index 9af5d59..683602b 100644
--- a/nixos/gc.nix
+++ b/nixos/gc.nix
@@ -11,6 +11,6 @@
   nix.gc = {
     automatic = true;
     dates = "weekly";
-    options = "--delete-older-than 7d";
+    options = "--delete-older-than 14d";
   };
 }
diff --git a/nixos/yubikey.nix b/nixos/yubikey.nix
index 8889568..3b83a52 100644
--- a/nixos/yubikey.nix
+++ b/nixos/yubikey.nix
@@ -8,20 +8,17 @@
     enableSSHSupport = true;
   };
 
-  security.pam.services = {
-    login.u2fAuth = true;
-    sudo.u2fAuth = true;
+  security.pam.u2f = {
+    enable = true;
+    cue = true;
+    control = "sufficient";
   };
 
-  # FIXME Replace [your_yubikey_model_id] with the actual model ID of your YubiKey. You can find the model ID using the `lsusb` command, typically available as a part of the `usbutils` package
-  services.udev.extraRules = ''
-      ACTION=="remove",\
-       ENV{ID_BUS}=="usb",\
-       ENV{ID_MODEL_ID}=="your_yubikey_model_id",\
-       ENV{ID_VENDOR_ID}=="1050",\
-       ENV{ID_VENDOR}=="Yubico",\
-       RUN+="${pkgs.systemd}/bin/loginctl lock-sessions"
-  '';
+  security.pam.services = {
+    greetd.u2fAuth = true;
+    sudo.u2fAuth = true;
+    swaylock.u2fAuth = true;
+  };
 
   # FIXME Don't forget to create an authorization mapping file for your user (https://nixos.wiki/wiki/Yubikey#pam_u2f)
   environment.systemPackages = with pkgs; [