diff --git a/home-manager/modules/de2u.nix b/home-manager/modules/de2u.nix
index 72cc3ec..7bcadff 100644
--- a/home-manager/modules/de2u.nix
+++ b/home-manager/modules/de2u.nix
@@ -27,18 +27,6 @@ in {
     ezcolors.enable = lib.mkDefault true;
     ezfonts.enable = lib.mkDefault true;
 
-    systemd.user.services.yubikey-touch-detector = {
-      Service = {
-        ExecStart = toString (pkgs.writeShellScript "yubikey-touch-detector-libnotify" ''
-          export SSH_AUTH_SOCK="$(${pkgs.gnupg}/bin/gpgconf --list-dirs agent-ssh-socket)"
-          ${pkgs.yubikey-touch-detector}/bin/yubikey-touch-detector -libnotify
-        '');
-      };
-      Install = rec {
-        WantedBy = ["graphical-session.target"];
-      };
-    };
-
     programs.firefox.enable = true;
 
     programs.kermit = {
diff --git a/home-manager/modules/de3u.nix b/home-manager/modules/de3u.nix
index fae27ec..9c17933 100644
--- a/home-manager/modules/de3u.nix
+++ b/home-manager/modules/de3u.nix
@@ -239,18 +239,6 @@ in {
       };
     };
 
-    systemd.user.services.yubikey-touch-detector = {
-      Service = {
-        ExecStart = toString (pkgs.writeShellScript "yubikey-touch-detector-libnotify" ''
-          export SSH_AUTH_SOCK="$(${pkgs.gnupg}/bin/gpgconf --list-dirs agent-ssh-socket)"
-          ${pkgs.yubikey-touch-detector}/bin/yubikey-touch-detector -libnotify
-        '');
-      };
-      Install = rec {
-        WantedBy = ["graphical-session.target"];
-      };
-    };
-
     programs.firefox.enable = true;
 
     programs.kermit = {
diff --git a/home-manager/users/notgne2.nix b/home-manager/users/notgne2.nix
index ac03fff..b168123 100644
--- a/home-manager/users/notgne2.nix
+++ b/home-manager/users/notgne2.nix
@@ -19,7 +19,6 @@ in {
 
   home.packages = with pkgs; [
     bat
-    gnupg
     zsh-powerlevel9k
     fzf # also needed for fzf.vim
     xclip # needed for nvim
@@ -245,11 +244,6 @@ in {
     base0F = "00f769";
   };
 
-  services.gpg-agent = {
-    enableSshSupport = true;
-    enableExtraSocket = true;
-  };
-
   home.sessionVariables = {
     FZF_DEFAULT_COMMAND = "${pkgs.fd}/bin/fd --type f";
   };
diff --git a/users/notgne2.nix b/users/notgne2.nix
index b5ea0ad..2118f0a 100644
--- a/users/notgne2.nix
+++ b/users/notgne2.nix
@@ -13,7 +13,10 @@
     description = "notgne2";
 
     openssh.authorizedKeys.keys = [
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPIBwL8/TuE5GT1708sR3rVc1C1g2DmoSf35kjXKKLcr yubi"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPIBwL8/TuE5GT1708sR3rVc1C1g2DmoSf35kjXKKLcr yubi-gpg"
+
+      "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIGaqwvQJIPcbs2XpTsZajChEQqssoO6FOOaiIILjmpOiAAAABHNzaDo= yubi"
+      "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIENkz61YMUpObL8Q7pVrLCRStZLtFJvEiSs4T0uZag3RAAAABHNzaDo= yubismol"
     ];
   };
 }