diff --git a/programs/gnome.nix b/programs/gnome.nix
index 784f4b5..9fec1d9 100644
--- a/programs/gnome.nix
+++ b/programs/gnome.nix
@@ -1,10 +1,10 @@
-{ pkgs, ... }:
+{ lib, pkgs, ... }:
 {
   services = {
-    xserver.desktopManager.gnome.enable = true;
-    displayManager = {
-      defaultSession = "gnome";
-      gdm = {
+    displayManager.defaultSession = "gnome";
+    xserver = {
+      desktopManager.gnome.enable = true;
+      displayManager.gdm = {
         enable = true;
         wayland = true;
       };
@@ -20,6 +20,10 @@
     ];
   };
 
+  # ssh-agent is provided by gnome-keyring-daemon
+  # (mabye soon by gcr, see NixOS/nixpkgs#140824)
+  programs.ssh.startAgent = lib.mkForce false;
+
   environment = with pkgs; {
     systemPackages = [ gnome-tweaks ];