diff --git a/nixos/ssh.nix b/nixos/ssh.nix
index 563a0571..c73b8d9a 100644
--- a/nixos/ssh.nix
+++ b/nixos/ssh.nix
@@ -1,5 +1,6 @@
 { config, pkgs, ... }:
 {
+  security.pam.sshAgentAuth.enable = true;
   services.avahi = {
     enable = true;
     nssmdns4 = true;
@@ -25,7 +26,7 @@
   };
 
   programs.ssh = {
-    forwardX11 = true;
+    forwardX11 = false;
     setXAuthLocation = true;
     knownHosts = {
       github = {