commit b9eea406166ab5b16c950a9542b4c4a8e5e51bad · pyrox.dev/nixpkgs

+1 -1

.github/labeler.yml

···

       393
       393
        
             - changed-files:

     

       394
       394
        
                 - any-glob-to-any-file:

     

       395
       395
        
                     - nixos/modules/services/desktops/pantheon/**/*

     

       396
       396
       -
                     - nixos/modules/services/x11/desktop-managers/pantheon.nix

     

       396
       396
       +
                     - nixos/modules/services/desktop-managers/pantheon.nix

     

       397
       397
        
                     - nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix

     

       398
       398
        
                     - nixos/tests/pantheon.nix

     

       399
       399
        
                     - pkgs/desktops/pantheon/**/*

+1 -1

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

···

38
38

39
39

- GNOME 3 has been upgraded to 3.34. Please take a look at their [Release Notes](https://help.gnome.org/misc/release-notes/3.34) for details.

40
40

41
41
-
- If you enable the Pantheon Desktop Manager via [services.xserver.desktopManager.pantheon.enable](options.html#opt-services.xserver.desktopManager.pantheon.enable), we now default to also use [ Pantheon's newly designed greeter ](https://blog.elementary.io/say-hello-to-the-new-greeter/). Contrary to NixOS's usual update policy, Pantheon will receive updates during the cycle of NixOS 20.03 when backwards compatible.

41
41
+
- If you enable the Pantheon Desktop Manager via `services.xserver.desktopManager.pantheon.enable`, we now default to also use [ Pantheon's newly designed greeter ](https://blog.elementary.io/say-hello-to-the-new-greeter/). Contrary to NixOS's usual update policy, Pantheon will receive updates during the cycle of NixOS 20.03 when backwards compatible.

42
42

43
43

- By default zfs pools will now be trimmed on a weekly basis. Trimming is only done on supported devices (i.e. NVME or SSDs) and should improve throughput and lifetime of these devices. It is controlled by the `services.zfs.trim.enable` varname. The zfs scrub service (`services.zfs.autoScrub.enable`) and the zfs autosnapshot service (`services.zfs.autoSnapshot.enable`) are now only enabled if zfs is set in `config.boot.initrd.supportedFilesystems` or `config.boot.supportedFilesystems`. These lists will automatically contain zfs as soon as any zfs mountpoint is configured in `fileSystems`.

44
44

+1 -1

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

···

       33
       33
        
           ./retroarch.nix

     

       34
       34
        
           ./kodi.nix

     

       35
       35
        
           ./mate.nix

     

       36
       36
       -
           ./pantheon.nix

     

       36
       36
       +
           ../../desktop-managers/pantheon.nix

     

       37
       37
        
           ./surf-display.nix

     

       38
       38
        
           ./cde.nix

     

       39
       39
        
           ./cinnamon.nix

+3 -3

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

···

       6
       6
        
       

     

       7
       7
        
       All of Pantheon is working in NixOS and the applications should be available, aside from a few [exceptions](https://github.com/NixOS/nixpkgs/issues/58161). To enable Pantheon, set

     

       8
       8
        
       ```nix

     

       9
       9
       -
       { services.xserver.desktopManager.pantheon.enable = true; }

     

       9
       9
       +
       { services.desktopManager.pantheon.enable = true; }

     

       10
       10
        
       ```

     

       11
       11
        
       This automatically enables LightDM and Pantheon's LightDM greeter. If you'd like to disable this, set

     

       12
       12
        
       ```nix

     
···

       25
       25
        
       

     

       26
       26
        
       Wingpanel and Switchboard work differently than they do in other distributions, as far as using plugins. You cannot install a plugin globally (like with {option}`environment.systemPackages`) to start using it. You should instead be using the following options:

     

       27
       27
        
       

     

       28
       28
       -
         - [](#opt-services.xserver.desktopManager.pantheon.extraWingpanelIndicators)

     

       29
       29
       -
         - [](#opt-services.xserver.desktopManager.pantheon.extraSwitchboardPlugs)

     

       28
       28
       +
         - [](#opt-services.desktopManager.pantheon.extraWingpanelIndicators)

     

       29
       29
       +
         - [](#opt-services.desktopManager.pantheon.extraSwitchboardPlugs)

     

       30
       30
        
       

     

       31
       31
        
       to configure the programs with plugs or indicators.

     

       32
       32

+10 -3

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

···

       10
       10
        
       

     

       11
       11
        
       let

     

       12
       12
        
       

     

       13
       13
       -
         cfg = config.services.xserver.desktopManager.pantheon;

     

       13
       13
       +
         cfg = config.services.desktopManager.pantheon;

     

       14
       14
        
         serviceCfg = config.services.pantheon;

     

       15
       15
        
       

     

       16
       16
        
         nixos-gsettings-desktop-schemas = pkgs.pantheon.elementary-gsettings-schemas.override {

     
···

       28
       28
        
           maintainers = teams.pantheon.members;

     

       29
       29
        
         };

     

       30
       30
        
       

     

       31
       31
       +
         imports = [

     

       32
       32
       +
           (lib.mkRenamedOptionModule

     

       33
       33
       +
             [ "services" "xserver" "desktopManager" "pantheon" ]

     

       34
       34
       +
             [ "services" "desktopManager" "pantheon" ]

     

       35
       35
       +
           )

     

       36
       36
       +
         ];

     

       37
       37
       +
       

     

       31
       38
        
         options = {

     

       32
       39
        
       

     

       33
       40
        
           services.pantheon = {

     
···

       40
       47
        
       

     

       41
       48
        
           };

     

       42
       49
        
       

     

       43
       43
       -
           services.xserver.desktopManager.pantheon = {

     

       50
       50
       +
           services.desktopManager.pantheon = {

     

       44
       51
        
             enable = mkOption {

     

       45
       52
        
               type = types.bool;

     

       46
       53
        
               default = false;

     
···

       98
       105
        
       

     

       99
       106
        
         config = mkMerge [

     

       100
       107
        
           (mkIf cfg.enable {

     

       101
       101
       -
             services.xserver.desktopManager.pantheon.sessionPath = utils.removePackagesByName [

     

       108
       108
       +
             services.desktopManager.pantheon.sessionPath = utils.removePackagesByName [

     

       102
       109
        
               pkgs.pantheon.pantheon-agent-geoclue2

     

       103
       110
        
             ] config.environment.pantheon.excludePackages;

     

       104
       111

+1 -1

nixos/release.nix

···

       619
       619
        
             { ... }:

     

       620
       620
        
             {

     

       621
       621
        
               services.xserver.enable = true;

     

       622
       622
       -
               services.xserver.desktopManager.pantheon.enable = true;

     

       622
       622
       +
               services.desktopManager.pantheon.enable = true;

     

       623
       623
        
             }

     

       624
       624
        
           );

     

       625
       625

+1 -1

nixos/tests/pantheon-wayland.nix

···

       29
       29
        
             virtualisation.memorySize = 2047;

     

       30
       30
        
       

     

       31
       31
        
             services.xserver.enable = true;

     

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

     

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

     

       33
       33
        
             services.displayManager = {

     

       34
       34
        
               autoLogin.enable = true;

     

       35
       35
        
               autoLogin.user = nodes.machine.users.users.alice.name;

+1 -1

nixos/tests/pantheon.nix

···

       15
       15
        
             virtualisation.memorySize = 2047;

     

       16
       16
        
       

     

       17
       17
        
             services.xserver.enable = true;

     

       18
       18
       -
             services.xserver.desktopManager.pantheon.enable = true;

     

       18
       18
       +
             services.desktopManager.pantheon.enable = true;

     

       19
       19
        
       

     

       20
       20
        
             # We ship pantheon.appcenter by default when this is enabled.

     

       21
       21
        
             services.flatpak.enable = true;

+1 -1

pkgs/by-name/ca/calamares-nixos-extensions/src/modules/nixos/main.py

···

       140
       140
        
       

     

       141
       141
        
         # Enable the Pantheon Desktop Environment.

     

       142
       142
        
         services.xserver.displayManager.lightdm.enable = true;

     

       143
       143
       -
         services.xserver.desktopManager.pantheon.enable = true;

     

       143
       143
       +
         services.desktopManager.pantheon.enable = true;

     

       144
       144
        
       

     

       145
       145
        
       """

     

       146
       146