···

       
88
       
88
       
 
       
    fonts.enableDefaultFonts = mkDefault true;

     

       
89
       
89
       
 
       
    programs.dconf.enable = mkDefault true;

     

       
90
       
90
       
 
       
    # To make a Sway session available if a display manager like SDDM is enabled:

     

       
91
       
91
       
-
       
    services.xserver.displayManager.extraSessionFilePackages = [ swayJoined ];

     

       
91
       
91
       
+
       
    services.xserver.displayManager.sessionPackages = [ swayJoined ];

     

       
92
       
92
       
 
       
  };

     

       
93
       
93
       
 
       


     

       
94
       
94
       
 
       
  meta.maintainers = with lib.maintainers; [ gnidorah primeos colemickens ];

     

···

       
101
       
101
       
 
       
              These are the known valid session names:

     

       
102
       
102
       
 
       
                ${concatMapStringsSep "\n  " (w: "services.xserver.desktopManager.default = \"${w.name}\";") cfg.session.list}

     

       
103
       
103
       
 
       
              It's also possible the default can be found in one of these packages:

     

       
104
       
104
       
-
       
                ${concatMapStringsSep "\n  " (p: p.name) config.services.xserver.displayManager.extraSessionFilePackages}

     

       
104
       
104
       
+
       
                ${concatMapStringsSep "\n  " (p: p.name) config.services.xserver.displayManager.sessionPackages}

     

       
105
       
105
       
 
       
            '' defaultDM;

     

       
106
       
106
       
 
       
      };

     

       
107
       
107
       
 
       


     

···

       
144
       
144
       
 
       
      services.gnome3.core-shell.enable = true;

     

       
145
       
145
       
 
       
      services.gnome3.core-utilities.enable = mkDefault true;

     

       
146
       
146
       
 
       


     

       
147
       
147
       
-
       
      services.xserver.displayManager.extraSessionFilePackages = [ pkgs.gnome3.gnome-session ];

     

       
147
       
147
       
+
       
      services.xserver.displayManager.sessionPackages = [ pkgs.gnome3.gnome-session ];

     

       
148
       
148
       
 
       


     

       
149
       
149
       
 
       
      environment.extraInit = ''

     

       
150
       
150
       
 
       
        ${concatMapStrings (p: ''

     
···

       
171
       
171
       
 
       
    })

     

       
172
       
172
       
 
       


     

       
173
       
173
       
 
       
    (mkIf flashbackEnabled {

     

       
174
       
174
       
-
       
      services.xserver.displayManager.extraSessionFilePackages =  map

     

       
174
       
174
       
+
       
      services.xserver.displayManager.sessionPackages =  map

     

       
175
       
175
       
 
       
        (wm: pkgs.gnome3.gnome-flashback.mkSessionForWm {

     

       
176
       
176
       
 
       
          inherit (wm) wmName wmLabel wmCommand;

     

       
177
       
177
       
 
       
        }) (optional cfg.flashback.enableMetacity {

     

···

       
69
       
69
       
 
       


     

       
70
       
70
       
 
       
  config = mkIf cfg.enable {

     

       
71
       
71
       
 
       


     

       
72
       
72
       
-
       
    services.xserver.displayManager.extraSessionFilePackages = [ pkgs.pantheon.elementary-session-settings ];

     

       
72
       
72
       
+
       
    services.xserver.displayManager.sessionPackages = [ pkgs.pantheon.elementary-session-settings ];

     

       
73
       
73
       
 
       


     

       
74
       
74
       
 
       
    # Ensure lightdm is used when Pantheon is enabled

     

       
75
       
75
       
 
       
    # Without it screen locking will be nonfunctional because of the use of lightlocker

     

···

       
118
       
118
       
 
       
  };

     

       
119
       
119
       
 
       


     

       
120
       
120
       
 
       
  config = mkIf cfg.enable {

     

       
121
       
121
       
-
       
    services.xserver.displayManager.extraSessionFilePackages = [

     

       
121
       
121
       
+
       
    services.xserver.displayManager.sessionPackages = [

     

       
122
       
122
       
 
       
      pkgs.surf-display

     

       
123
       
123
       
 
       
    ];

     

       
124
       
124
       
 
       


     

···

       
194
       
194
       
 
       
        if test -d ${pkg}/share/xsessions; then

     

       
195
       
195
       
 
       
          ${xorg.lndir}/bin/lndir ${pkg}/share/xsessions $out/share/xsessions

     

       
196
       
196
       
 
       
        fi

     

       
197
       
197
       
-
       
      '') cfg.displayManager.extraSessionFilePackages}

     

       
197
       
197
       
+
       
      '') cfg.displayManager.sessionPackages}

     

       
198
       
198
       
+
       


     

       
198
       
199
       
 
       


     

       
199
       
200
       
 
       
      ${concatMapStrings (pkg: ''

     

       
200
       
201
       
 
       
        if test -d ${pkg}/share/wayland-sessions; then

     

       
201
       
202
       
 
       
          mkdir -p "$out/share/wayland-sessions"

     

       
202
       
203
       
 
       
          ${xorg.lndir}/bin/lndir ${pkg}/share/wayland-sessions $out/share/wayland-sessions

     

       
203
       
204
       
 
       
        fi

     

       
204
       
204
       
-
       
      '') cfg.displayManager.extraSessionFilePackages}

     

       
205
       
205
       
+
       
      '') cfg.displayManager.sessionPackages}

     

       
205
       
206
       
 
       
    '';

     

       
206
       
207
       
 
       


     

       
207
       
208
       
 
       
in

     
···

       
261
       
262
       
 
       
        '';

     

       
262
       
263
       
 
       
      };

     

       
263
       
264
       
 
       


     

       
264
       
264
       
-
       
      extraSessionFilePackages = mkOption {

     

       
265
       
265
       
+
       
      sessionPackages = mkOption {

     

       
265
       
266
       
 
       
        type = types.listOf types.package;

     

       
266
       
267
       
 
       
        default = [];

     

       
267
       
268
       
 
       
        description = ''

     

       
268
       
268
       
-
       
          A list of packages containing xsession files to be passed to the display manager.

     

       
269
       
269
       
+
       
          A list of packages containing x11 or wayland session files to be passed to the display manager.

     

       
269
       
270
       
 
       
        '';

     

       
270
       
271
       
 
       
      };

     

       
271
       
272