diff --git a/home-manager/common/software/cli/atuin.nix b/home-manager/common/software/cli/atuin.nix
index bfbd746e..3624f487 100644
--- a/home-manager/common/software/cli/atuin.nix
+++ b/home-manager/common/software/cli/atuin.nix
@@ -1,4 +1,4 @@
-{ config, ... }: {
+{ config, username, ... }: {
   programs.atuin = {
     enable = true;
     enableBashIntegration = true;
@@ -12,7 +12,7 @@
       search_mode = "fuzzy";
       search_mode_shell_up_key_binding = "fuzzy";
       secrets_filter = true;
-      key_path = "/run/secrets/atuin_key";
+      key_path = "/run/secrets/${username}/atuin_key";
       filter_mode = "global";
       workspaces = true;
       inline_height = 75;
diff --git a/nixos/hosts/nixos-desktop/default.nix b/nixos/hosts/nixos-desktop/default.nix
index ea4c7a78..187b2c81 100644
--- a/nixos/hosts/nixos-desktop/default.nix
+++ b/nixos/hosts/nixos-desktop/default.nix
@@ -2,6 +2,7 @@
   imports = [ 
     ./disks.nix
     ../../common/modules/secureboot.nix
+    ../../common/modules/yubikey-auth.nix
     ../../common/modules/ssh-luks.nix
     ../../common/services/openrazer.nix
     ../../common/services/podman.nix
@@ -82,5 +83,4 @@
     # Other
     pkgs.android-udev-rules
   ];
-
 }
diff --git a/nixos/users/albert/default.nix b/nixos/users/albert/default.nix
index f1f95679..736a345f 100644
--- a/nixos/users/albert/default.nix
+++ b/nixos/users/albert/default.nix
@@ -34,12 +34,12 @@ in {
   # Used in home-manager's atuin config
   # Used here instead of  home-manager because HM randomly needs to restart sops-nix and I can't 
   # find a way to do so
-  sops.secrets.atuin_key = {
+  sops.secrets."albert/atuin_key" = {
     sopsFile = ../../../secrets/users/albert.yaml;
     owner = "albert";
   };
 
-  sops.secrets.email_password = {
+  sops.secrets."albert.email_password" = {
     sopsFile = ../../../secrets/users/albert.yaml;
     owner = "albert"; 
   };