commit c464c44a42739a53a019e616055cbf4b8357871b · pyrox.dev/nixpkgs

+1 -1

.github/labeler.yml

···

       162
       162
        
             - any-glob-to-any-file:

     

       163
       163
        
               - doc/languages-frameworks/gnome.section.md

     

       164
       164
        
               - nixos/modules/services/desktops/gnome/**/*

     

       165
       165
       -
               - nixos/modules/services/x11/desktop-managers/gnome.nix

     

       165
       165
       +
               - nixos/modules/services/desktop-managers/gnome.nix

     

       166
       166
        
               - nixos/tests/gnome-xorg.nix

     

       167
       167
        
               - nixos/tests/gnome.nix

     

       168
       168
        
               - pkgs/desktops/gnome/**/*

+2 -2

nixos/doc/manual/configuration/x-windows.chapter.md

···

       29
       29
        
       {

     

       30
       30
        
         services.xserver.desktopManager.plasma5.enable = true;

     

       31
       31
        
         services.xserver.desktopManager.xfce.enable = true;

     

       32
       32
       -
         services.xserver.desktopManager.gnome.enable = true;

     

       32
       32
       +
         services.desktopManager.gnome.enable = true;

     

       33
       33
        
         services.xserver.desktopManager.mate.enable = true;

     

       34
       34
        
         services.xserver.windowManager.xmonad.enable = true;

     

       35
       35
        
         services.xserver.windowManager.twm.enable = true;

     
···

       46
       46
        
       ```nix

     

       47
       47
        
       {

     

       48
       48
        
         services.displayManager.sddm.enable = true;

     

       49
       49
       -
         services.xserver.displayManager.gdm.enable = true;

     

       49
       49
       +
         services.displayManager.gdm.enable = true;

     

       50
       50
        
       }

     

       51
       51
        
       ```

     

       52
       52

+1 -1

nixos/doc/manual/release-notes/rl-2505.section.md

···

       20
       20
        
       - GNOME has been updated to version 48.

     

       21
       21
        
       

     

       22
       22
        
         - `decibels` music player is now installed by default. You can disable it using [](#opt-environment.gnome.excludePackages).

     

       23
       23
       -
         - `gnome-shell-extensions` extension collection (which included GNOME Classic extensions, Apps Menu, and User Themes, among others) are no longer installed by default. You can install them again with [](#opt-services.xserver.desktopManager.gnome.sessionPath).

     

       23
       23
       +
         - `gnome-shell-extensions` extension collection (which included GNOME Classic extensions, Apps Menu, and User Themes, among others) are no longer installed by default. You can install them again with {option}`services.xserver.desktopManager.gnome.sessionPath`.

     

       24
       24
        
         - Option [](#opt-services.gnome.core-developer-tools.enable) now also installs `sysprof` and `d-spy`.

     

       25
       25
        
         - Option `services.gnome.core-utilities.enable` has been renamed to [](#opt-services.gnome.core-apps.enable).

     

       26
       26
        
         - `cantarell-fonts`, `source-code-pro` and `source-sans` fonts are no longer installed by default. They have been replaced by `adwaita-fonts`.

+2 -2

nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix

···

       7
       7
        
       

     

       8
       8
        
         isoImage.edition = lib.mkDefault "gnome";

     

       9
       9
        
       

     

       10
       10
       -
         services.xserver.desktopManager.gnome = {

     

       10
       10
       +
         services.desktopManager.gnome = {

     

       11
       11
        
           # Add Firefox and other tools useful for installation to the launcher

     

       12
       12
        
           favoriteAppsOverride = ''

     

       13
       13
        
             [org.gnome.shell]

     
···

       35
       35
        
           QT_QPA_PLATFORM = "$([[ $XDG_SESSION_TYPE = \"wayland\" ]] && echo \"wayland\")";

     

       36
       36
        
         };

     

       37
       37
        
       

     

       38
       38
       -
         services.xserver.displayManager.gdm = {

     

       38
       38
       +
         services.displayManager.gdm = {

     

       39
       39
        
           enable = true;

     

       40
       40
        
           # autoSuspend makes the machine automatically suspend after inactivity.

     

       41
       41
        
           # It's possible someone could/try to ssh'd into the machine and obviously

+2 -2

nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix

···

       7
       7
        
       

     

       8
       8
        
         isoImage.edition = lib.mkDefault "gnome";

     

       9
       9
        
       

     

       10
       10
       -
         services.xserver.desktopManager.gnome = {

     

       10
       10
       +
         services.desktopManager.gnome = {

     

       11
       11
        
           # Add Firefox and other tools useful for installation to the launcher

     

       12
       12
        
           favoriteAppsOverride = ''

     

       13
       13
        
             [org.gnome.shell]

     
···

       16
       16
        
           enable = true;

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
       -
         services.xserver.displayManager.gdm = {

     

       19
       19
       +
         services.displayManager.gdm = {

     

       20
       20
        
           enable = true;

     

       21
       21
        
           # autoSuspend makes the machine automatically suspend after inactivity.

     

       22
       22
        
           # It's possible someone could/try to ssh'd into the machine and obviously

+1 -1

nixos/modules/module-list.nix

···

       589
       589
        
         ./services/development/zammad.nix

     

       590
       590
        
         ./services/display-managers/cosmic-greeter.nix

     

       591
       591
        
         ./services/display-managers/default.nix

     

       592
       592
       +
         ./services/display-managers/gdm.nix

     

       592
       593
        
         ./services/display-managers/greetd.nix

     

       593
       594
        
         ./services/display-managers/ly.nix

     

       594
       595
        
         ./services/display-managers/sddm.nix

     
···

       1706
       1707
        
         ./services/x11/colord.nix

     

       1707
       1708
        
         ./services/x11/desktop-managers/default.nix

     

       1708
       1709
        
         ./services/x11/display-managers/default.nix

     

       1709
       1709
       -
         ./services/x11/display-managers/gdm.nix

     

       1710
       1710
        
         ./services/x11/display-managers/lightdm.nix

     

       1711
       1711
        
         ./services/x11/display-managers/slim.nix

     

       1712
       1712
        
         ./services/x11/display-managers/startx.nix

+1 -1

nixos/modules/programs/gpaste.nix

···

       27
       27
        
           services.dbus.packages = [ pkgs.gpaste ];

     

       28
       28
        
           systemd.packages = [ pkgs.gpaste ];

     

       29
       29
        
           # gnome-control-center crashes in Keyboard Shortcuts pane without the GSettings schemas.

     

       30
       30
       -
           services.xserver.desktopManager.gnome.sessionPath = [ pkgs.gpaste ];

     

       30
       30
       +
           services.desktopManager.gnome.sessionPath = [ pkgs.gpaste ];

     

       31
       31
        
           # gpaste-reloaded applet doesn't work without the typelib

     

       32
       32
        
           services.xserver.desktopManager.cinnamon.sessionPath = [ pkgs.gpaste ];

     

       33
       33
        
         };

+1 -1

nixos/modules/programs/nautilus-open-any-terminal.nix

···

       28
       28
        
             nautilus-open-any-terminal

     

       29
       29
        
           ];

     

       30
       30
        
       

     

       31
       31
       -
           environment.sessionVariables = lib.mkIf (!config.services.xserver.desktopManager.gnome.enable) {

     

       31
       31
       +
           environment.sessionVariables = lib.mkIf (!config.services.desktopManager.gnome.enable) {

     

       32
       32
        
             NAUTILUS_4_EXTENSION_DIR = "${pkgs.nautilus-python}/lib/nautilus/extensions-4";

     

       33
       33
        
           };

     

       34
       34

+1 -1

nixos/modules/programs/zoom-us.nix

···

       33
       33
        
       

     

       34
       34
        
               # Support GNOME desktop environment if it's enabled on the system.

     

       35
       35
        
               gnomeXdgDesktopPortalSupport =

     

       36
       36
       -
                 prev.gnomeXdgDesktopPortalSupport or config.services.xserver.desktopManager.gnome.enable;

     

       36
       36
       +
                 prev.gnomeXdgDesktopPortalSupport or config.services.desktopManager.gnome.enable;

     

       37
       37
        
       

     

       38
       38
        
               # Support Hyprland desktop for Wayland if it's enabled on the system.

     

       39
       39
        
               hyprlandXdgDesktopPortalSupport =

+1 -1

nixos/modules/services/display-managers/default.nix

···

       257
       257
        
               dmConf = config.services.xserver.displayManager;

     

       258
       258
        
               noDmUsed =

     

       259
       259
        
                 !(

     

       260
       260
       -
                   dmConf.gdm.enable || cfg.sddm.enable || dmConf.xpra.enable || dmConf.lightdm.enable || cfg.ly.enable

     

       260
       260
       +
                   cfg.gdm.enable || cfg.sddm.enable || dmConf.xpra.enable || dmConf.lightdm.enable || cfg.ly.enable

     

       261
       261
        
                 );

     

       262
       262
        
             in

     

       263
       263
        
             lib.mkIf noDmUsed (lib.mkDefault false);

+1 -1

nixos/modules/services/x11/desktop-managers/default.nix

···

       31
       31
        
           ./lumina.nix

     

       32
       32
        
           ./lxqt.nix

     

       33
       33
        
           ./enlightenment.nix

     

       34
       34
       -
           ./gnome.nix

     

       35
       34
        
           ./retroarch.nix

     

       36
       35
        
           ./kodi.nix

     

       37
       36
        
           ./mate.nix

     
···

       43
       42
        
           ./deepin.nix

     

       44
       43
        
           ../../desktop-managers/lomiri.nix

     

       45
       44
        
           ../../desktop-managers/cosmic.nix

     

       45
       45
       +
           ../../desktop-managers/gnome.nix

     

       46
       46
        
         ];

     

       47
       47
        
       

     

       48
       48
        
         options = {

+8 -8

nixos/modules/services/x11/desktop-managers/gnome.md nixos/modules/services/desktop-managers/gnome.md

···

       10
       10
        
       

     

       11
       11
        
       ```nix

     

       12
       12
        
       {

     

       13
       13
       -
         services.xserver.desktopManager.gnome.enable = true;

     

       14
       14
       -
         services.xserver.displayManager.gdm.enable = true;

     

       13
       13
       +
         services.desktopManager.gnome.enable = true;

     

       14
       14
       +
         services.displayManager.gdm.enable = true;

     

       15
       15
        
       }

     

       16
       16
        
       ```

     

       17
       17
        
       

     
···

       76
       76
        
       

     

       77
       77
        
       ```nix

     

       78
       78
        
       {

     

       79
       79
       -
         services.xserver.desktopManager.gnome.flashback.enableMetacity = true;

     

       79
       79
       +
         services.desktopManager.gnome.flashback.enableMetacity = true;

     

       80
       80
        
       }

     

       81
       81
        
       ```

     

       82
       82
        
       

     

       83
       83
       -
       It is also possible to create custom sessions that replace Metacity with a different window manager using [](#opt-services.xserver.desktopManager.gnome.flashback.customSessions).

     

       83
       83
       +
       It is also possible to create custom sessions that replace Metacity with a different window manager using [](#opt-services.desktopManager.gnome.flashback.customSessions).

     

       84
       84
        
       

     

       85
       85
        
       The following example uses `xmonad` window manager:

     

       86
       86
        
       

     

       87
       87
        
       ```nix

     

       88
       88
        
       {

     

       89
       89
       -
         services.xserver.desktopManager.gnome.flashback.customSessions = [

     

       89
       89
       +
         services.desktopManager.gnome.flashback.customSessions = [

     

       90
       90
        
           {

     

       91
       91
        
             wmName = "xmonad";

     

       92
       92
        
             wmLabel = "XMonad";

     
···

       143
       143
        
       :::

     

       144
       144
        
       

     

       145
       145
        
       You can override the default GSettings values using the

     

       146
       146
       -
       [](#opt-services.xserver.desktopManager.gnome.extraGSettingsOverrides) option.

     

       146
       146
       +
       [](#opt-services.desktopManager.gnome.extraGSettingsOverrides) option.

     

       147
       147
        
       

     

       148
       148
        
       Take note that whatever packages you want to override GSettings for, you need to add them to

     

       149
       149
       -
       [](#opt-services.xserver.desktopManager.gnome.extraGSettingsOverridePackages).

     

       149
       149
       +
       [](#opt-services.desktopManager.gnome.extraGSettingsOverridePackages).

     

       150
       150
        
       

     

       151
       151
        
       You can use `dconf-editor` tool to explore which GSettings you can set.

     

       152
       152
        
       

     
···

       154
       154
        
       

     

       155
       155
        
       ```nix

     

       156
       156
        
       {

     

       157
       157
       -
         services.xserver.desktopManager.gnome = {

     

       157
       157
       +
         services.desktopManager.gnome = {

     

       158
       158
        
           extraGSettingsOverrides = ''

     

       159
       159
        
             # Change default background

     

       160
       160
        
             [org.gnome.desktop.background]

+38 -6

nixos/modules/services/x11/desktop-managers/gnome.nix nixos/modules/services/desktop-managers/gnome.nix

···

       15
       15
        
           literalExpression

     

       16
       16
        
           ;

     

       17
       17
        
       

     

       18
       18
       -
         cfg = config.services.xserver.desktopManager.gnome;

     

       18
       18
       +
         cfg = config.services.desktopManager.gnome;

     

       19
       19
        
         serviceCfg = config.services.gnome;

     

       20
       20
        
       

     

       21
       21
        
         # Prioritize nautilus by default when opening directories

     
···

       78
       78
        
       in

     

       79
       79
        
       

     

       80
       80
        
       {

     

       81
       81
       -
       

     

       82
       81
        
         meta = {

     

       83
       82
        
           doc = ./gnome.md;

     

       84
       83
        
           maintainers = lib.teams.gnome.members;

     
···

       86
       85
        
       

     

       87
       86
        
         imports = [

     

       88
       87
        
           (lib.mkRenamedOptionModule

     

       88
       88
       +
             [ "services" "xserver" "desktopManager" "gnome" "enable" ]

     

       89
       89
       +
             [ "services" "desktopManager" "gnome" "enable" ]

     

       90
       90
       +
           )

     

       91
       91
       +
           (lib.mkRenamedOptionModule

     

       92
       92
       +
             [ "services" "xserver" "desktopManager" "gnome" "extraGSettingsOverrides" ]

     

       93
       93
       +
             [ "services" "desktopManager" "gnome" "extraGSettingsOverrides" ]

     

       94
       94
       +
           )

     

       95
       95
       +
           (lib.mkRenamedOptionModule

     

       96
       96
       +
             [ "services" "xserver" "desktopManager" "gnome" "extraGSettingsOverridePackages" ]

     

       97
       97
       +
             [ "services" "desktopManager" "gnome" "extraGSettingsOverridePackages" ]

     

       98
       98
       +
           )

     

       99
       99
       +
           (lib.mkRenamedOptionModule

     

       100
       100
       +
             [ "services" "xserver" "desktopManager" "gnome" "debug" ]

     

       101
       101
       +
             [ "services" "desktopManager" "gnome" "debug" ]

     

       102
       102
       +
           )

     

       103
       103
       +
           (lib.mkRenamedOptionModule

     

       104
       104
       +
             [ "services" "xserver" "desktopManager" "gnome" "sessionPath" ]

     

       105
       105
       +
             [ "services" "desktopManager" "gnome" "sessionPath" ]

     

       106
       106
       +
           )

     

       107
       107
       +
           # flashback options

     

       108
       108
       +
           (lib.mkRenamedOptionModule

     

       109
       109
       +
             [ "services" "xserver" "desktopManager" "gnome" "flashback" "customSessions" ]

     

       110
       110
       +
             [ "services" "desktopManager" "gnome" "flashback" "customSessions" ]

     

       111
       111
       +
           )

     

       112
       112
       +
           (lib.mkRenamedOptionModule

     

       113
       113
       +
             [ "services" "xserver" "desktopManager" "gnome" "flashback" "enableMetacity" ]

     

       114
       114
       +
             [ "services" "desktopManager" "gnome" "flashback" "enableMetacity" ]

     

       115
       115
       +
           )

     

       116
       116
       +
           (lib.mkRenamedOptionModule

     

       117
       117
       +
             [ "services" "xserver" "desktopManager" "gnome" "flashback" "panelModulePackages" ]

     

       118
       118
       +
             [ "services" "desktopManager" "gnome" "flashback" "panelModulePackages" ]

     

       119
       119
       +
           )

     

       120
       120
       +
           (lib.mkRenamedOptionModule

     

       89
       121
        
             [ "services" "gnome" "core-utilities" "enable" ]

     

       90
       122
        
             [ "services" "gnome" "core-apps" "enable" ]

     

       91
       123
        
           )

     
···

       101
       133
        
             games.enable = mkEnableOption "GNOME games";

     

       102
       134
        
           };

     

       103
       135
        
       

     

       104
       104
       -
           services.xserver.desktopManager.gnome = {

     

       136
       136
       +
           services.desktopManager.gnome = {

     

       105
       137
        
             enable = mkOption {

     

       106
       138
        
               type = types.bool;

     

       107
       139
        
               default = false;

     
···

       213
       245
        
             system.nixos-generate-config.desktopConfiguration = [

     

       214
       246
        
               ''

     

       215
       247
        
                 # Enable the GNOME Desktop Environment.

     

       216
       216
       -
                 services.xserver.displayManager.gdm.enable = true;

     

       217
       217
       -
                 services.xserver.desktopManager.gnome.enable = true;

     

       248
       248
       +
                 services.displayManager.gdm.enable = true;

     

       249
       249
       +
                 services.desktopManager.gnome.enable = true;

     

       218
       250
        
               ''

     

       219
       251
        
             ];

     

       220
       252
        
       

     
···

       333
       365
        
           })

     

       334
       366
        
       

     

       335
       367
        
           (lib.mkIf serviceCfg.core-shell.enable {

     

       336
       336
       -
             services.xserver.desktopManager.gnome.sessionPath = [

     

       368
       368
       +
             services.desktopManager.gnome.sessionPath = [

     

       337
       369
        
               pkgs.gnome-shell

     

       338
       370
        
             ];

     

       339
       371

+47 -17

nixos/modules/services/x11/display-managers/gdm.nix nixos/modules/services/display-managers/gdm.nix

···

       7
       7
        
       

     

       8
       8
        
       let

     

       9
       9
        
       

     

       10
       10
       -
         cfg = config.services.xserver.displayManager;

     

       10
       10
       +
         cfg = config.services.displayManager.gdm;

     

       11
       11
        
         gdm = pkgs.gdm;

     

       12
       12
       +
         xdmcfg = config.services.xserver.displayManager;

     

       12
       13
        
         pamLogin = config.security.pam.services.login;

     

       13
       14
        
         settingsFormat = pkgs.formats.ini { };

     

       14
       14
       -
         configFile = settingsFormat.generate "custom.conf" cfg.gdm.settings;

     

       15
       15
       +
         configFile = settingsFormat.generate "custom.conf" cfg.settings;

     

       15
       16
        
       

     

       16
       17
        
         xSessionWrapper =

     

       17
       17
       -
           if (cfg.setupCommands == "") then

     

       18
       18
       +
           if (xdmcfg.setupCommands == "") then

     

       18
       19
        
             null

     

       19
       20
        
           else

     

       20
       21
        
             pkgs.writeScript "gdm-x-session-wrapper" ''

     

       21
       22
        
               #!${pkgs.bash}/bin/bash

     

       22
       22
       -
               ${cfg.setupCommands}

     

       23
       23
       +
               ${xdmcfg.setupCommands}

     

       23
       24
        
               exec "$@"

     

       24
       25
        
             '';

     

       25
       26
        
       

     
···

       41
       42
        
       

     

       42
       43
        
         defaultSessionName = config.services.displayManager.defaultSession;

     

       43
       44
        
       

     

       44
       44
       -
         setSessionScript = pkgs.callPackage ./account-service-util.nix { };

     

       45
       45
       +
         setSessionScript = pkgs.callPackage ../x11/display-managers/account-service-util.nix { };

     

       45
       46
        
       in

     

       46
       47
        
       

     

       47
       48
        
       {

     
···

       72
       73
        
             "gdm"

     

       73
       74
        
             "nvidiaWayland"

     

       74
       75
        
           ] "We defer to GDM whether Wayland should be enabled.")

     

       76
       76
       +
       

     

       77
       77
       +
           (lib.mkRenamedOptionModule

     

       78
       78
       +
             [ "services" "xserver" "displayManager" "gdm" "enable" ]

     

       79
       79
       +
             [ "services" "displayManager" "gdm" "enable" ]

     

       80
       80
       +
           )

     

       81
       81
       +
           (lib.mkRenamedOptionModule

     

       82
       82
       +
             [ "services" "xserver" "displayManager" "gdm" "debug" ]

     

       83
       83
       +
             [ "services" "displayManager" "gdm" "debug" ]

     

       84
       84
       +
           )

     

       85
       85
       +
           (lib.mkRenamedOptionModule

     

       86
       86
       +
             [ "services" "xserver" "displayManager" "gdm" "banner" ]

     

       87
       87
       +
             [ "services" "displayManager" "gdm" "banner" ]

     

       88
       88
       +
           )

     

       89
       89
       +
           (lib.mkRenamedOptionModule

     

       90
       90
       +
             [ "services" "xserver" "displayManager" "gdm" "settings" ]

     

       91
       91
       +
             [ "services" "displayManager" "gdm" "settings" ]

     

       92
       92
       +
           )

     

       93
       93
       +
           (lib.mkRenamedOptionModule

     

       94
       94
       +
             [ "services" "xserver" "displayManager" "gdm" "wayland" ]

     

       95
       95
       +
             [ "services" "displayManager" "gdm" "wayland" ]

     

       96
       96
       +
           )

     

       97
       97
       +
           (lib.mkRenamedOptionModule

     

       98
       98
       +
             [ "services" "xserver" "displayManager" "gdm" "autoSuspend" ]

     

       99
       99
       +
             [ "services" "displayManager" "gdm" "autoSuspend" ]

     

       100
       100
       +
           )

     

       101
       101
       +
           (lib.mkRenamedOptionModule

     

       102
       102
       +
             [ "services" "xserver" "displayManager" "gdm" "autoLogin" "delay" ]

     

       103
       103
       +
             [ "services" "displayManager" "gdm" "autoLogin" "delay" ]

     

       104
       104
       +
           )

     

       75
       105
        
         ];

     

       76
       106
        
       

     

       77
       107
        
         meta = {

     
···

       82
       112
        
       

     

       83
       113
        
         options = {

     

       84
       114
        
       

     

       85
       85
       -
           services.xserver.displayManager.gdm = {

     

       115
       115
       +
           services.displayManager.gdm = {

     

       86
       116
        
       

     

       87
       117
        
             enable = lib.mkEnableOption "GDM, the GNOME Display Manager";

     

       88
       118
        
       

     
···

       145
       175
        
       

     

       146
       176
        
         ###### implementation

     

       147
       177
        
       

     

       148
       148
       -
         config = lib.mkIf cfg.gdm.enable {

     

       178
       178
       +
         config = lib.mkIf cfg.enable {

     

       149
       179
        
       

     

       150
       180
        
           services.xserver.displayManager.lightdm.enable = false;

     

       151
       181
        
       

     
···

       170
       200
        
       

     

       171
       201
        
             environment =

     

       172
       202
        
               {

     

       173
       173
       -
                 GDM_X_SERVER_EXTRA_ARGS = toString (lib.filter (arg: arg != "-terminate") cfg.xserverArgs);

     

       203
       203
       +
                 GDM_X_SERVER_EXTRA_ARGS = toString (lib.filter (arg: arg != "-terminate") xdmcfg.xserverArgs);

     

       174
       204
        
                 XDG_DATA_DIRS = lib.makeSearchPath "share" [

     

       175
       205
        
                   gdm # for gnome-login.session

     

       176
       206
        
                   config.services.displayManager.sessionData.desktops

     
···

       274
       304
        
           systemd.user.services.dbus.wantedBy = [ "default.target" ];

     

       275
       305
        
       

     

       276
       306
        
           programs.dconf.profiles.gdm.databases =

     

       277
       277
       -
             lib.optionals (!cfg.gdm.autoSuspend) [

     

       307
       307
       +
             lib.optionals (!cfg.autoSuspend) [

     

       278
       308
        
               {

     

       279
       309
        
                 settings."org/gnome/settings-daemon/plugins/power" = {

     

       280
       310
        
                   sleep-inactive-ac-type = "nothing";

     
···

       284
       314
        
                 };

     

       285
       315
        
               }

     

       286
       316
        
             ]

     

       287
       287
       -
             ++ lib.optionals (cfg.gdm.banner != null) [

     

       317
       317
       +
             ++ lib.optionals (cfg.banner != null) [

     

       288
       318
        
               {

     

       289
       319
        
                 settings."org/gnome/login-screen" = {

     

       290
       320
        
                   banner-message-enable = true;

     

       291
       291
       -
                   banner-message-text = cfg.gdm.banner;

     

       321
       321
       +
                   banner-message-text = cfg.banner;

     

       292
       322
        
                 };

     

       293
       323
        
               }

     

       294
       324
        
             ]

     
···

       297
       327
        
           # Use AutomaticLogin if delay is zero, because it's immediate.

     

       298
       328
        
           # Otherwise with TimedLogin with zero seconds the prompt is still

     

       299
       329
        
           # presented and there's a little delay.

     

       300
       300
       -
           services.xserver.displayManager.gdm.settings = {

     

       330
       330
       +
           services.displayManager.gdm.settings = {

     

       301
       331
        
             daemon = lib.mkMerge [

     

       302
       302
       -
               { WaylandEnable = cfg.gdm.wayland; }

     

       332
       332
       +
               { WaylandEnable = cfg.wayland; }

     

       303
       333
        
               # nested if else didn't work

     

       304
       304
       -
               (lib.mkIf (config.services.displayManager.autoLogin.enable && cfg.gdm.autoLogin.delay != 0) {

     

       334
       334
       +
               (lib.mkIf (config.services.displayManager.autoLogin.enable && cfg.autoLogin.delay != 0) {

     

       305
       335
        
                 TimedLoginEnable = true;

     

       306
       336
        
                 TimedLogin = config.services.displayManager.autoLogin.user;

     

       307
       307
       -
                 TimedLoginDelay = cfg.gdm.autoLogin.delay;

     

       337
       337
       +
                 TimedLoginDelay = cfg.autoLogin.delay;

     

       308
       338
        
               })

     

       309
       309
       -
               (lib.mkIf (config.services.displayManager.autoLogin.enable && cfg.gdm.autoLogin.delay == 0) {

     

       339
       339
       +
               (lib.mkIf (config.services.displayManager.autoLogin.enable && cfg.autoLogin.delay == 0) {

     

       310
       340
        
                 AutomaticLoginEnable = true;

     

       311
       341
        
                 AutomaticLogin = config.services.displayManager.autoLogin.user;

     

       312
       342
        
               })

     

       313
       343
        
             ];

     

       314
       314
       -
             debug = lib.mkIf cfg.gdm.debug {

     

       344
       344
       +
             debug = lib.mkIf cfg.debug {

     

       315
       345
        
               Enable = true;

     

       316
       346
        
             };

     

       317
       347
        
           };

+1 -1

nixos/modules/services/x11/terminal-server.nix

···

       17
       17
        
           services.xserver.videoDrivers = [ ];

     

       18
       18
        
       

     

       19
       19
        
           # Enable GDM.  Any display manager will do as long as it supports XDMCP.

     

       20
       20
       -
           services.xserver.displayManager.gdm.enable = true;

     

       20
       20
       +
           services.displayManager.gdm.enable = true;

     

       21
       21
        
       

     

       22
       22
        
           systemd.sockets.terminal-server = {

     

       23
       23
        
             description = "Terminal Server Socket";

+1 -1

nixos/modules/services/x11/xserver.nix

···

       761
       761
        
               dmConf = cfg.displayManager;

     

       762
       762
        
               default =

     

       763
       763
        
                 !(

     

       764
       764
       -
                   dmConf.gdm.enable

     

       764
       764
       +
                   config.services.displayManager.gdm.enable

     

       765
       765
        
                   || config.services.displayManager.sddm.enable

     

       766
       766
        
                   || dmConf.xpra.enable

     

       767
       767
        
                   || dmConf.sx.enable

+2 -2

nixos/release.nix

···

       610
       610
        
             { ... }:

     

       611
       611
        
             {

     

       612
       612
        
               services.xserver.enable = true;

     

       613
       613
       -
               services.xserver.displayManager.gdm.enable = true;

     

       614
       614
       -
               services.xserver.desktopManager.gnome.enable = true;

     

       613
       613
       +
               services.displayManager.gdm.enable = true;

     

       614
       614
       +
               services.desktopManager.gnome.enable = true;

     

       615
       615
        
             }

     

       616
       616
        
           );

     

       617
       617

+2 -2

nixos/tests/gnome-extensions.nix

···

       34
       34
        
             };

     

       35
       35
        
       

     

       36
       36
        
             # Configure Gnome

     

       37
       37
       -
             services.xserver.desktopManager.gnome.enable = true;

     

       38
       38
       -
             services.xserver.desktopManager.gnome.debug = true;

     

       37
       37
       +
             services.desktopManager.gnome.enable = true;

     

       38
       38
       +
             services.desktopManager.gnome.debug = true;

     

       39
       39
        
       

     

       40
       40
        
             systemd.user.services = {

     

       41
       41
        
               "org.gnome.Shell@wayland" = {

+6 -6

nixos/tests/gnome-flashback.nix

···

       14
       14
        
       

     

       15
       15
        
             services.xserver.enable = true;

     

       16
       16
        
       

     

       17
       17
       -
             services.xserver.displayManager = {

     

       18
       18
       -
               gdm.enable = true;

     

       19
       19
       -
               gdm.debug = true;

     

       17
       17
       +
             services.displayManager.gdm = {

     

       18
       18
       +
               enable = true;

     

       19
       19
       +
               debug = true;

     

       20
       20
        
             };

     

       21
       21
        
       

     

       22
       22
        
             services.displayManager.autoLogin = {

     
···

       24
       24
        
               user = user.name;

     

       25
       25
        
             };

     

       26
       26
        
       

     

       27
       27
       -
             services.xserver.desktopManager.gnome.enable = true;

     

       28
       28
       -
             services.xserver.desktopManager.gnome.debug = true;

     

       29
       29
       -
             services.xserver.desktopManager.gnome.flashback.enableMetacity = true;

     

       27
       27
       +
             services.desktopManager.gnome.enable = true;

     

       28
       28
       +
             services.desktopManager.gnome.debug = true;

     

       29
       29
       +
             services.desktopManager.gnome.flashback.enableMetacity = true;

     

       30
       30
        
             services.displayManager.defaultSession = "gnome-flashback-metacity";

     

       31
       31
        
           };

     

       32
       32

+5 -5

nixos/tests/gnome-xorg.nix

···

       16
       16
        
       

     

       17
       17
        
             services.xserver.enable = true;

     

       18
       18
        
       

     

       19
       19
       -
             services.xserver.displayManager = {

     

       20
       20
       -
               gdm.enable = true;

     

       21
       21
       -
               gdm.debug = true;

     

       19
       19
       +
             services.displayManager.gdm = {

     

       20
       20
       +
               enable = true;

     

       21
       21
       +
               debug = true;

     

       22
       22
        
             };

     

       23
       23
        
       

     

       24
       24
        
             services.displayManager.autoLogin = {

     
···

       26
       26
        
               user = user.name;

     

       27
       27
        
             };

     

       28
       28
        
       

     

       29
       29
       -
             services.xserver.desktopManager.gnome.enable = true;

     

       30
       30
       -
             services.xserver.desktopManager.gnome.debug = true;

     

       29
       29
       +
             services.desktopManager.gnome.enable = true;

     

       30
       30
       +
             services.desktopManager.gnome.debug = true;

     

       31
       31
        
             services.displayManager.defaultSession = "gnome-xorg";

     

       32
       32
        
       

     

       33
       33
        
             systemd.user.services = {

+5 -5

nixos/tests/gnome.nix

···

       11
       11
        
       

     

       12
       12
        
             services.xserver.enable = true;

     

       13
       13
        
       

     

       14
       14
       -
             services.xserver.displayManager = {

     

       15
       15
       -
               gdm.enable = true;

     

       16
       16
       -
               gdm.debug = true;

     

       14
       14
       +
             services.displayManager.gdm = {

     

       15
       15
       +
               enable = true;

     

       16
       16
       +
               debug = true;

     

       17
       17
        
             };

     

       18
       18
        
       

     

       19
       19
        
             services.displayManager.autoLogin = {

     
···

       21
       21
        
               user = "alice";

     

       22
       22
        
             };

     

       23
       23
        
       

     

       24
       24
       -
             services.xserver.desktopManager.gnome.enable = true;

     

       25
       25
       -
             services.xserver.desktopManager.gnome.debug = true;

     

       24
       24
       +
             services.desktopManager.gnome.enable = true;

     

       25
       25
       +
             services.desktopManager.gnome.debug = true;

     

       26
       26
        
       

     

       27
       27
        
             systemd.user.services = {

     

       28
       28
        
               "org.gnome.Shell@wayland" = {

+3 -3

nixos/tests/nixos-generate-config.nix

···

       15
       15
        
           system.nixos-generate-config.desktopConfiguration = [

     

       16
       16
        
             ''

     

       17
       17
        
               # DESKTOP

     

       18
       18
       -
               services.xserver.displayManager.gdm.enable = true;

     

       19
       19
       -
               services.xserver.desktopManager.gnome.enable = true;

     

       18
       18
       +
               services.displayManager.gdm.enable = true;

     

       19
       19
       +
               services.desktopManager.gnome.enable = true;

     

       20
       20
        
             ''

     

       21
       21
        
           ];

     

       22
       22
        
         };

     
···

       40
       40
        
       

     

       41
       41
        
           # Test if the Perl variable $desktopConfiguration is spliced correctly

     

       42
       42
        
           machine.succeed(

     

       43
       43
       -
               "grep 'services\\.xserver\\.desktopManager\\.gnome\\.enable = true;' /etc/nixos/configuration.nix"

     

       43
       43
       +
               "grep 'services\\.desktopManager\\.gnome\\.enable = true;' /etc/nixos/configuration.nix"

     

       44
       44
        
           )

     

       45
       45
        
       

     

       46
       46
        
           machine.succeed("rm -rf /etc/nixos")

+1 -1

pkgs/by-name/gd/gdm/package.nix

···

       115
       115
        
           })

     

       116
       116
        
       

     

       117
       117
        
           # The following patches implement certain environment variables in GDM which are set by

     

       118
       118
       -
           # the gdm configuration module (nixos/modules/services/x11/display-managers/gdm.nix).

     

       118
       118
       +
           # the gdm configuration module (gdm.nix).

     

       119
       119
        
       

     

       120
       120
        
           ./gdm-x-session_extra_args.patch

     

       121
       121

+1 -1

pkgs/by-name/ne/nemo-seahorse/package.nix

···

       74
       74
        
                 libcryptui

     

       75
       75
        
               ];

     

       76
       76
        
       

     

       77
       77
       -
               services.xserver.desktopManager.gnome.extraGSettingsOverridePackages = with pkgs; [

     

       77
       77
       +
               services.desktopManager.gnome.extraGSettingsOverridePackages = with pkgs; [

     

       78
       78
        
                 nemo

     

       79
       79
        
                 gcr

     

       80
       80
        
                 libcryptui