···

       
190
       
190
       
 
       
    users.groups.gdm.gid = config.ids.gids.gdm;

     

       
191
       
191
       
 
       


     

       
192
       
192
       
 
       
    # GDM needs different xserverArgs, presumable because using wayland by default.

     

       
193
       
193
       
-
       
    services.xserver.tty = null;

     

       
194
       
193
       
 
       
    services.xserver.display = null;

     

       
195
       
194
       
 
       
    services.xserver.verbose = null;

     

       
196
       
195
       
 
       


     

···

       
70
       
70
       
 
       
      # Required for wayland with setLoginUid = false;

     

       
71
       
71
       
 
       
      seatd.enable = true;

     

       
72
       
72
       
 
       
      xserver = {

     

       
73
       
73
       
-
       
        # To enable user switching, allow lemurs to allocate TTYs/displays dynamically.

     

       
74
       
74
       
-
       
        tty = null;

     

       
73
       
73
       
+
       
        # To enable user switching, allow lemurs to allocate displays dynamically.

     

       
75
       
74
       
 
       
        display = null;

     

       
76
       
75
       
 
       
      };

     

       
77
       
76
       
 
       
      displayManager = {

     

···

       
118
       
118
       
 
       
      };

     

       
119
       
119
       
 
       


     

       
120
       
120
       
 
       
      xserver = {

     

       
121
       
121
       
-
       
        # To enable user switching, allow ly to allocate TTYs/displays dynamically.

     

       
122
       
122
       
-
       
        tty = null;

     

       
121
       
121
       
+
       
        # To enable user switching, allow ly to allocate displays dynamically.

     

       
123
       
122
       
 
       
        display = null;

     

       
124
       
123
       
 
       
      };

     

       
125
       
124
       
 
       
    };

     

···

       
93
       
93
       
 
       
  }

     

       
94
       
94
       
 
       
  // optionalAttrs xcfg.enable {

     

       
95
       
95
       
 
       
    X11 = {

     

       
96
       
96
       
-
       
      MinimumVT = if xcfg.tty != null then xcfg.tty else 7;

     

       
97
       
96
       
 
       
      ServerPath = toString xserverWrapper;

     

       
98
       
97
       
 
       
      XephyrPath = "${pkgs.xorg.xorgserver.out}/bin/Xephyr";

     

       
99
       
98
       
 
       
      SessionCommand = toString dmcfg.sessionData.wrapper;

     
···

       
419
       
418
       
 
       
    services = {

     

       
420
       
419
       
 
       
      dbus.packages = [ sddm ];

     

       
421
       
420
       
 
       
      xserver = {

     

       
422
       
422
       
-
       
        # To enable user switching, allow sddm to allocate TTYs/displays dynamically.

     

       
423
       
423
       
-
       
        tty = null;

     

       
421
       
421
       
+
       
        # To enable user switching, allow sddm to allocate displays dynamically.

     

       
424
       
422
       
 
       
        display = null;

     

       
425
       
423
       
 
       
      };

     

       
426
       
424
       
 
       
    };

     

···

       
336
       
336
       
 
       
    ];

     

       
337
       
337
       
 
       


     

       
338
       
338
       
 
       
    users.groups.lightdm.gid = config.ids.gids.lightdm;

     

       
339
       
339
       
-
       
    services.xserver.tty = null; # We might start multiple X servers so let the tty increment themselves..

     

       
340
       
339
       
 
       
    services.xserver.display = null; # We specify our own display (and logfile) in xserver-wrapper up there

     

       
341
       
340
       
 
       
  };

     

       
342
       
341
       
 
       
}

     

···

       
277
       
277
       
 
       
        "dir"

     

       
278
       
278
       
 
       
      ];

     

       
279
       
279
       
 
       
    })

     

       
280
       
280
       
+
       
    (lib.mkRemovedOptionModule [

     

       
281
       
281
       
+
       
      "services"

     

       
282
       
282
       
+
       
      "xserver"

     

       
283
       
283
       
+
       
      "tty"

     

       
284
       
284
       
+
       
    ] "'services.xserver.tty' was removed because it was ineffective.")

     

       
280
       
285
       
 
       
  ];

     

       
281
       
286
       
 
       


     

       
282
       
287
       
 
       
  ###### interface

     
···

       
675
       
680
       
 
       
        '';

     

       
676
       
681
       
 
       
      };

     

       
677
       
682
       
 
       


     

       
678
       
678
       
-
       
      tty = mkOption {

     

       
679
       
679
       
-
       
        type = types.nullOr types.int;

     

       
680
       
680
       
-
       
        default = 7;

     

       
681
       
681
       
-
       
        description = "Virtual console for the X server.";

     

       
682
       
682
       
-
       
      };

     

       
683
       
683
       
-
       


     

       
684
       
683
       
 
       
      display = mkOption {

     

       
685
       
684
       
 
       
        type = types.nullOr types.int;

     

       
686
       
685
       
 
       
        default = 0;

     
···

       
886
       
885
       
 
       
      "${cfg.xkb.dir}"

     

       
887
       
886
       
 
       
    ]

     

       
888
       
887
       
 
       
    ++ optional (cfg.display != null) ":${toString cfg.display}"

     

       
889
       
889
       
-
       
    ++ optional (cfg.tty != null) "vt${toString cfg.tty}"

     

       
890
       
888
       
 
       
    ++ optional (cfg.dpi != null) "-dpi ${toString cfg.dpi}"

     

       
891
       
889
       
 
       
    ++ optional (cfg.logFile != null) "-logfile ${toString cfg.logFile}"

     

       
892
       
890
       
 
       
    ++ optional (cfg.verbose != null) "-verbose ${toString cfg.verbose}"