From 69a2842d01dfa592137a652dbeaf5592a8424840 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 22 Nov 2009 14:34:53 +0000
Subject: [PATCH] Switch off one of the two conflicting on-by-default options

svn path=/nixos/trunk/; revision=18519
---
 modules/services/x11/xserver.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index b4554ac5c52..3afad9d7615 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -209,7 +209,7 @@ in
       };
 
       startGnuPGAgent = mkOption {
-        default = true;
+        default = false;
         description = ''
           Whether to start the GnuPG agent when you log in.  The GnuPG agent
           remembers private keys for you so that you don't have to type in