diff --git a/home.nix b/home.nix
index 683e060..89d2878 100644
--- a/home.nix
+++ b/home.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
 {
   home.username = "l-wyatt";
@@ -121,6 +121,9 @@
     };
   };
 
+  # Disable GCR ssh-agent so gpg-agent handles SSH
+  systemd.user.sockets.gcr-ssh-agent.Install.WantedBy = lib.mkForce [];
+
   # GPG configuration
   programs.gpg = {
     enable = true;
@@ -141,7 +144,7 @@
   programs.git = {
     enable = true;
     signing = {
-      key = null; # Will be set after GPG key generation
+      key = "0xADCEAC560B498269";
       signByDefault = true;
     };
     settings = {
diff --git a/yubikey.md b/yubikey.md
index 7f045a3..61555c0 100644
--- a/yubikey.md
+++ b/yubikey.md
@@ -1,27 +1,5 @@
 # Post-Rebuild YubiKey Setup Guide
 
-## Step 0: Rebuild & Reboot
-
-```bash
-nixos-rebuild switch
-# Then reboot to ensure gpg-agent replaces gnome-keyring as SSH agent
-reboot
-```
-
-After reboot, verify the new environment:
-
-```bash
-gpg --version           # Should show GnuPG 2.4+
-ykman info              # Should show your YubiKey model/serial
-gpg --card-status       # Should show the YubiKey smartcard
-echo $SSH_AUTH_SOCK     # Should point to gpg-agent socket, NOT gcr
-```
-
-> If `gpg --card-status` hangs or errors, restart pcscd:
-> `sudo systemctl restart pcscd`
-
----
-
 ## Step 1: Generate GPG Master Key
 
 ```bash