From d914ebbdea1def28fad061194ec4b3c8b2d439de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20R=C3=B6ger?= <jonas.roeger@tu-dortmund.de>
Date: Fri, 26 Sep 2025 19:47:12 +0200
Subject: [PATCH] System Gen105 @ 2025-09-26-19:47:12 by jonas@monolith

---
 modules/hardware/yubikey.nix | 11 +++++++----
 modules/home/yubikey.nix     | 29 +++++++++++------------------
 2 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/modules/hardware/yubikey.nix b/modules/hardware/yubikey.nix
index 6c2e74b..c09c764 100644
--- a/modules/hardware/yubikey.nix
+++ b/modules/hardware/yubikey.nix
@@ -15,18 +15,21 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
-    # Include udev rules for yubikey.
     services.udev.packages = with pkgs; [
       yubikey-personalization
     ];
 
-    # OTP Manager
     environment.systemPackages = with pkgs; [
+      gnupg
       yubikey-personalization
       yubioath-flutter
     ];
 
-    # Enable smartcard support
-    hardware.gpgSmartcards.enable = true;
+    services.pcscd.enable = true;
+
+    programs.gnupg.agent = {
+      enable = true;
+      enableSSHSupport = true;
+    };
   };
 }
diff --git a/modules/home/yubikey.nix b/modules/home/yubikey.nix
index aebf548..498abcc 100644
--- a/modules/home/yubikey.nix
+++ b/modules/home/yubikey.nix
@@ -27,23 +27,16 @@ in {
         }
       ];
     };
-    services.gpg-agent = {
-      enable = true;
-      enableSshSupport = true;
-      enableZshIntegration = true;
-      pinentry.package =
-        if cfg.pinentry == "qt"
-        then pkgs.pinentry-qt
-        else pkgs.pinentry.gnome3;
-      extraConfig = ''
-        allow-emacs-pinentry
-      '';
-    };
-    home.sessionVariables = {
-      SSH_AUTH_SOCK = "$XDG_RUNTIME_DIR/gnupg/S.gpg-agent.ssh";
-    };
-    systemd.user.settings.Manager.DefaultEnvironment = lib.mapAttrs (_: lib.mkDefault) {
-      SSH_AUTH_SOCK = "/run/user/%U/gnupg/S.gpg-agent.ssh";
-    };
+    # services.gpg-agent = {
+    #   enable = true;
+    #   enableSshSupport = true;
+    #   enableZshIntegration = true;
+    # };
+    # home.sessionVariables = {
+    #   SSH_AUTH_SOCK = "$XDG_RUNTIME_DIR/gnupg/S.gpg-agent.ssh";
+    # };
+    # systemd.user.settings.Manager.DefaultEnvironment = lib.mapAttrs (_: lib.mkDefault) {
+    #   SSH_AUTH_SOCK = "/run/user/%U/gnupg/S.gpg-agent.ssh";
+    # };
   };
 }