commit c718a7eca49a03ec19488c101bd11fb7689e4e08 · pyrox.dev/nixpkgs

+1 -1

.github/labeler.yml

···

       393
        
             - changed-files:

     

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

     

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

     

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

     

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

     

       398
        
                     - nixos/tests/pantheon.nix

     

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

···

       393
        
             - changed-files:

     

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

     

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

     

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

     

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

     

       398
        
                     - nixos/tests/pantheon.nix

     

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

+1 -1

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

···

       38
        
       

     

       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
        
       

     

       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.

     

       42
        
       

     

       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

···

       38
        
       

     

       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
        
       

     

       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
        
       

     

       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

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

···

       248
        
       

     

       249
        
       - mate-wayland-session 1.28.4 is now using the default wayfire decorator instead of firedecor, thus `services.xserver.desktopManager.mate.enableWaylandSession` is no longer shipping firedecor. If you are experiencing broken window decorations after upgrade, backup and remove `~/.config/mate/wayfire.ini` and re-login.

     

       250
        
       

     

       0
        
       
     

       0
        
       
     

       251
        
       - `services.gitea` supports sending notifications with sendmail again. To do this, activate the parameter `services.gitea.mailerUseSendmail` and configure SMTP server.

     

       252
        
       

     

       253
        
       - `networking.wireless.networks.<name>` now has an option to specify SSID, hence allowing duplicated SSID setup. The BSSID option is added along side with this.

···

       248
        
       

     

       249
        
       - mate-wayland-session 1.28.4 is now using the default wayfire decorator instead of firedecor, thus `services.xserver.desktopManager.mate.enableWaylandSession` is no longer shipping firedecor. If you are experiencing broken window decorations after upgrade, backup and remove `~/.config/mate/wayfire.ini` and re-login.

     

       250
        
       

     

       251
       +
       - Due to [deprecation of gnome-session X11 support](https://blogs.gnome.org/alatiera/2025/06/08/the-x11-session-removal/), `services.desktopManager.pantheon` now defaults to pantheon-wayland session. The X11 session will be removed before gnome-session 49 lands.

     

       252
       +
       

     

       253
        
       - `services.gitea` supports sending notifications with sendmail again. To do this, activate the parameter `services.gitea.mailerUseSendmail` and configure SMTP server.

     

       254
        
       

     

       255
        
       - `networking.wireless.networks.<name>` now has an option to specify SSID, hence allowing duplicated SSID setup. The BSSID option is added along side with this.

+1 -1

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

···

       33
        
           ./retroarch.nix

     

       34
        
           ./kodi.nix

     

       35
        
           ./mate.nix

     

       36
       -
           ./pantheon.nix

     

       37
        
           ./surf-display.nix

     

       38
        
           ./cde.nix

     

       39
        
           ./cinnamon.nix

···

       33
        
           ./retroarch.nix

     

       34
        
           ./kodi.nix

     

       35
        
           ./mate.nix

     

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

     

       37
        
           ./surf-display.nix

     

       38
        
           ./cde.nix

     

       39
        
           ./cinnamon.nix

+3 -3

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

···

       6
        
       

     

       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
        
       ```nix

     

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

     

       10
        
       ```

     

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

     

       12
        
       ```nix

     
···

       25
        
       

     

       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
        
       

     

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

     

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

     

       30
        
       

     

       31
        
       to configure the programs with plugs or indicators.

     

       32

···

       6
        
       

     

       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
        
       ```nix

     

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

     

       10
        
       ```

     

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

     

       12
        
       ```nix

     
···

       25
        
       

     

       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
        
       

     

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

     

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

     

       30
        
       

     

       31
        
       to configure the programs with plugs or indicators.

     

       32

+18 -4

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

···

       10
        
       

     

       11
        
       let

     

       12
        
       

     

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

     

       14
        
         serviceCfg = config.services.pantheon;

     

       15
        
       

     

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

     
···

       28
        
           maintainers = teams.pantheon.members;

     

       29
        
         };

     

       30
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       31
        
         options = {

     

       32
        
       

     

       33
        
           services.pantheon = {

     
···

       40
        
       

     

       41
        
           };

     

       42
        
       

     

       43
       -
           services.xserver.desktopManager.pantheon = {

     

       44
        
             enable = mkOption {

     

       45
        
               type = types.bool;

     

       46
        
               default = false;

     
···

       98
        
       

     

       99
        
         config = mkMerge [

     

       100
        
           (mkIf cfg.enable {

     

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

     

       102
        
               pkgs.pantheon.pantheon-agent-geoclue2

     

       103
        
             ] config.environment.pantheon.excludePackages;

     

       104
        
       

     
···

       114
        
       

     

       115
        
             # Without this, elementary LightDM greeter will pre-select non-existent `default` session

     

       116
        
             # https://github.com/elementary/greeter/issues/368

     

       117
       -
             services.displayManager.defaultSession = mkDefault "pantheon";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       118
        
       

     

       119
        
             environment.extraInit = ''

     

       120
        
               ${concatMapStrings (p: ''

···

       10
        
       

     

       11
        
       let

     

       12
        
       

     

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

     

       14
        
         serviceCfg = config.services.pantheon;

     

       15
        
       

     

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

     
···

       28
        
           maintainers = teams.pantheon.members;

     

       29
        
         };

     

       30
        
       

     

       31
       +
         imports = [

     

       32
       +
           (lib.mkRenamedOptionModule

     

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

     

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

     

       35
       +
           )

     

       36
       +
         ];

     

       37
       +
       

     

       38
        
         options = {

     

       39
        
       

     

       40
        
           services.pantheon = {

     
···

       47
        
       

     

       48
        
           };

     

       49
        
       

     

       50
       +
           services.desktopManager.pantheon = {

     

       51
        
             enable = mkOption {

     

       52
        
               type = types.bool;

     

       53
        
               default = false;

     
···

       105
        
       

     

       106
        
         config = mkMerge [

     

       107
        
           (mkIf cfg.enable {

     

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

     

       109
        
               pkgs.pantheon.pantheon-agent-geoclue2

     

       110
        
             ] config.environment.pantheon.excludePackages;

     

       111
        
       

     
···

       121
        
       

     

       122
        
             # Without this, elementary LightDM greeter will pre-select non-existent `default` session

     

       123
        
             # https://github.com/elementary/greeter/issues/368

     

       124
       +
             services.displayManager.defaultSession = mkDefault "pantheon-wayland";

     

       125
       +
             programs.dconf.profiles.user.databases = [

     

       126
       +
               {

     

       127
       +
                 settings."io/elementary/greeter" = {

     

       128
       +
                   last-session-type = "pantheon-wayland";

     

       129
       +
                 };

     

       130
       +
               }

     

       131
       +
             ];

     

       132
        
       

     

       133
        
             environment.extraInit = ''

     

       134
        
               ${concatMapStrings (p: ''

+1 -1

nixos/release.nix

···

       525
        
             { ... }:

     

       526
        
             {

     

       527
        
               services.xserver.enable = true;

     

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

     

       529
        
             }

     

       530
        
           );

     

       531

···

       525
        
             { ... }:

     

       526
        
             {

     

       527
        
               services.xserver.enable = true;

     

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

     

       529
        
             }

     

       530
        
           );

     

       531

-1

nixos/tests/all-tests.nix

···

       1143
        
         pam-zfs-key = runTest ./pam/zfs-key.nix;

     

       1144
        
         pantalaimon = runTest ./matrix/pantalaimon.nix;

     

       1145
        
         pantheon = runTest ./pantheon.nix;

     

       1146
       -
         pantheon-wayland = runTest ./pantheon-wayland.nix;

     

       1147
        
         paperless = runTest ./paperless.nix;

     

       1148
        
         paretosecurity = runTest ./paretosecurity.nix;

     

       1149
        
         parsedmarc = handleTest ./parsedmarc { };

···

       1143
        
         pam-zfs-key = runTest ./pam/zfs-key.nix;

     

       1144
        
         pantalaimon = runTest ./matrix/pantalaimon.nix;

     

       1145
        
         pantheon = runTest ./pantheon.nix;

     

       0
        
       
     

       1146
        
         paperless = runTest ./paperless.nix;

     

       1147
        
         paretosecurity = runTest ./paretosecurity.nix;

     

       1148
        
         parsedmarc = handleTest ./parsedmarc { };

-104

nixos/tests/pantheon-wayland.nix

···

       1
       -
       { pkgs, lib, ... }:

     

       2
       -
       

     

       3
       -
       {

     

       4
       -
         name = "pantheon-wayland";

     

       5
       -
       

     

       6
       -
         meta.maintainers = lib.teams.pantheon.members;

     

       7
       -
       

     

       8
       -
         nodes.machine =

     

       9
       -
           { nodes, ... }:

     

       10
       -
       

     

       11
       -
           let

     

       12
       -
             videosAutostart = pkgs.writeTextFile {

     

       13
       -
               name = "autostart-elementary-videos";

     

       14
       -
               destination = "/etc/xdg/autostart/io.elementary.videos.desktop";

     

       15
       -
               text = ''

     

       16
       -
                 [Desktop Entry]

     

       17
       -
                 Version=1.0

     

       18
       -
                 Name=Videos

     

       19
       -
                 Type=Application

     

       20
       -
                 Terminal=false

     

       21
       -
                 Exec=io.elementary.videos %U

     

       22
       -
               '';

     

       23
       -
             };

     

       24
       -
           in

     

       25
       -
           {

     

       26
       -
             imports = [ ./common/user-account.nix ];

     

       27
       -
       

     

       28
       -
             # Workaround ".gala-wrapped invoked oom-killer"

     

       29
       -
             virtualisation.memorySize = 2047;

     

       30
       -
       

     

       31
       -
             services.xserver.enable = true;

     

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

     

       33
       -
             services.displayManager = {

     

       34
       -
               autoLogin.enable = true;

     

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

     

       36
       -
               defaultSession = "pantheon-wayland";

     

       37
       -
             };

     

       38
       -
       

     

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

     

       40
       -
             services.flatpak.enable = true;

     

       41
       -
       

     

       42
       -
             # For basic OCR tests.

     

       43
       -
             environment.systemPackages = [ videosAutostart ];

     

       44
       -
       

     

       45
       -
             # We don't ship gnome-text-editor in Pantheon module, we add this line mainly

     

       46
       -
             # to catch eval issues related to this option.

     

       47
       -
             environment.pantheon.excludePackages = [ pkgs.gnome-text-editor ];

     

       48
       -
           };

     

       49
       -
       

     

       50
       -
         enableOCR = true;

     

       51
       -
       

     

       52
       -
         testScript =

     

       53
       -
           { nodes, ... }:

     

       54
       -
           let

     

       55
       -
             user = nodes.machine.users.users.alice;

     

       56
       -
           in

     

       57
       -
           ''

     

       58
       -
             machine.wait_for_unit("display-manager.service")

     

       59
       -
       

     

       60
       -
             with subtest("Wait for wayland server"):

     

       61
       -
                 machine.wait_for_file("/run/user/${toString user.uid}/wayland-0")

     

       62
       -
       

     

       63
       -
             with subtest("Check that logging in has given the user ownership of devices"):

     

       64
       -
                 machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}")

     

       65
       -
       

     

       66
       -
             with subtest("Check if Pantheon components actually start"):

     

       67
       -
                 # We specifically check gsd-xsettings here since it is manually pulled up by gala.

     

       68
       -
                 # https://github.com/elementary/gala/pull/2140

     

       69
       -
                 for i in ["gala", "io.elementary.wingpanel", "io.elementary.dock", "gsd-media-keys", "gsd-xsettings", "io.elementary.desktop.agent-polkit"]:

     

       70
       -
                     machine.wait_until_succeeds(f"pgrep -f {i}")

     

       71
       -
                 machine.wait_until_succeeds("pgrep -xf ${pkgs.pantheon.elementary-files}/libexec/io.elementary.files.xdg-desktop-portal")

     

       72
       -
       

     

       73
       -
             with subtest("Check if various environment variables are set"):

     

       74
       -
                 cmd = "xargs --null --max-args=1 echo < /proc/$(pgrep -xf ${pkgs.pantheon.gala}/bin/gala)/environ"

     

       75
       -
                 machine.succeed(f"{cmd} | grep 'XDG_CURRENT_DESKTOP' | grep 'Pantheon'")

     

       76
       -
                 machine.succeed(f"{cmd} | grep 'XDG_SESSION_TYPE' | grep 'wayland'")

     

       77
       -
                 # Hopefully from the sessionPath option.

     

       78
       -
                 machine.succeed(f"{cmd} | grep 'XDG_DATA_DIRS' | grep 'gsettings-schemas/pantheon-agent-geoclue2'")

     

       79
       -
                 # Hopefully from login shell.

     

       80
       -
                 machine.succeed(f"{cmd} | grep '__NIXOS_SET_ENVIRONMENT_DONE' | grep '1'")

     

       81
       -
                 # Hopefully from gcr-ssh-agent.

     

       82
       -
                 machine.succeed(f"{cmd} | grep 'SSH_AUTH_SOCK' | grep 'gcr'")

     

       83
       -
       

     

       84
       -
             with subtest("Wait for elementary videos autostart"):

     

       85
       -
                 machine.wait_until_succeeds("pgrep -f io.elementary.videos")

     

       86
       -
                 machine.wait_for_text("No Videos Open")

     

       87
       -
                 machine.screenshot("videos")

     

       88
       -
       

     

       89
       -
             with subtest("Trigger multitasking view"):

     

       90
       -
                 cmd = "dbus-send --session --dest=org.pantheon.gala --print-reply /org/pantheon/gala org.pantheon.gala.PerformAction int32:1"

     

       91
       -
                 env = "DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/${toString user.uid}/bus"

     

       92
       -
                 machine.succeed(f"su - ${user.name} -c '{env} {cmd}'")

     

       93
       -
                 machine.sleep(5)

     

       94
       -
                 machine.screenshot("multitasking")

     

       95
       -
                 machine.succeed(f"su - ${user.name} -c '{env} {cmd}'")

     

       96
       -
       

     

       97
       -
             with subtest("Check if gala has ever coredumped"):

     

       98
       -
                 machine.fail("coredumpctl --json=short | grep gala")

     

       99
       -
                 # So we can see the dock.

     

       100
       -
                 machine.execute("pkill -f -9 io.elementary.videos")

     

       101
       -
                 machine.sleep(10)

     

       102
       -
                 machine.screenshot("screen")

     

       103
       -
           '';

     

       104
       -
       }

+34 -35

nixos/tests/pantheon.nix

···

       8
        
         nodes.machine =

     

       9
        
           { ... }:

     

       10
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       11
        
           {

     

       12
        
             imports = [ ./common/user-account.nix ];

     

       13
        
       

     
···

       15
        
             virtualisation.memorySize = 2047;

     

       16
        
       

     

       17
        
             services.xserver.enable = true;

     

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

     

       19
        
       

     

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

     

       21
        
             services.flatpak.enable = true;

     

       22
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       23
        
             # We don't ship gnome-text-editor in Pantheon module, we add this line mainly

     

       24
        
             # to catch eval issues related to this option.

     

       25
        
             environment.pantheon.excludePackages = [ pkgs.gnome-text-editor ];

     

       26
        
       

     

       27
       -
             environment.systemPackages = [ pkgs.xdotool ];

     

       28
        
           };

     

       29
        
       

     

       30
        
         enableOCR = true;

     
···

       33
        
           { nodes, ... }:

     

       34
        
           let

     

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

     

       36
       -
             bob = nodes.machine.users.users.bob;

     

       37
        
           in

     

       38
        
           ''

     

       39
        
             machine.wait_for_unit("display-manager.service")

     
···

       41
        
             with subtest("Test we can see usernames in elementary-greeter"):

     

       42
        
                 machine.wait_for_text("${user.description}")

     

       43
        
                 machine.wait_until_succeeds("pgrep -f io.elementary.greeter-compositor")

     

       44
       -
                 # OCR was struggling with this one.

     

       45
       -
                 # machine.wait_for_text("${bob.description}")

     

       46
        
                 # Ensure the password box is focused by clicking it.

     

       47
        
                 # Workaround for https://github.com/NixOS/nixpkgs/issues/211366.

     

       48
       -
                 machine.succeed("XAUTHORITY=/var/lib/lightdm/.Xauthority DISPLAY=:0 xdotool mousemove 512 505 click 1")

     

       0
        
       
     

       49
        
                 machine.sleep(2)

     

       50
        
                 machine.screenshot("elementary_greeter_lightdm")

     

       51
        
       

     

       52
        
             with subtest("Login with elementary-greeter"):

     

       53
        
                 machine.send_chars("${user.password}\n")

     

       54
       -
                 machine.wait_for_x()

     

       55
       -
                 machine.wait_for_file("${user.home}/.Xauthority")

     

       56
       -
                 machine.succeed("xauth merge ${user.home}/.Xauthority")

     

       57
        
                 machine.wait_until_succeeds('journalctl -t gnome-session-binary --grep "Entering running state"')

     

       58
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       59
        
             with subtest("Check that logging in has given the user ownership of devices"):

     

       60
        
                 machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}")

     

       61
        
       

     

       62
        
             with subtest("Check if Pantheon components actually start"):

     

       63
       -
                 for i in ["gala", "io.elementary.wingpanel", "io.elementary.dock", "gsd-media-keys", "io.elementary.desktop.agent-polkit"]:

     

       0
        
       
     

       0
        
       
     

       64
        
                     machine.wait_until_succeeds(f"pgrep -f {i}")

     

       65
       -
                 for i in ["gala", "io.elementary.wingpanel", "io.elementary.dock"]:

     

       66
       -
                     machine.wait_for_window(i)

     

       67
        
                 machine.wait_until_succeeds("pgrep -xf ${pkgs.pantheon.elementary-files}/libexec/io.elementary.files.xdg-desktop-portal")

     

       68
        
       

     

       69
        
             with subtest("Check if various environment variables are set"):

     

       70
        
                 cmd = "xargs --null --max-args=1 echo < /proc/$(pgrep -xf ${pkgs.pantheon.gala}/bin/gala)/environ"

     

       71
        
                 machine.succeed(f"{cmd} | grep 'XDG_CURRENT_DESKTOP' | grep 'Pantheon'")

     

       0
        
       
     

       72
        
                 # Hopefully from the sessionPath option.

     

       73
        
                 machine.succeed(f"{cmd} | grep 'XDG_DATA_DIRS' | grep 'gsettings-schemas/pantheon-agent-geoclue2'")

     

       74
        
                 # Hopefully from login shell.

     
···

       76
        
                 # Hopefully from gcr-ssh-agent.

     

       77
        
                 machine.succeed(f"{cmd} | grep 'SSH_AUTH_SOCK' | grep 'gcr'")

     

       78
        
       

     

       79
       -
             with subtest("Open elementary videos"):

     

       80
       -
                 machine.execute("su - ${user.name} -c 'DISPLAY=:0 io.elementary.videos >&2 &'")

     

       81
       -
                 machine.sleep(2)

     

       82
       -
                 machine.wait_for_window("io.elementary.videos")

     

       83
        
                 machine.wait_for_text("No Videos Open")

     

       84
       -
       

     

       85
       -
             with subtest("Open elementary calendar"):

     

       86
       -
                 machine.wait_until_succeeds("pgrep -f evolution-calendar-factory")

     

       87
       -
                 machine.execute("su - ${user.name} -c 'DISPLAY=:0 io.elementary.calendar >&2 &'")

     

       88
       -
                 machine.sleep(2)

     

       89
       -
                 machine.wait_for_window("io.elementary.calendar")

     

       90
       -
       

     

       91
       -
             with subtest("Open system settings"):

     

       92
       -
                 machine.execute("su - ${user.name} -c 'DISPLAY=:0 io.elementary.settings >&2 &'")

     

       93
       -
                 # Wait for all plugins to be loaded before we check if the window is still there.

     

       94
       -
                 machine.sleep(5)

     

       95
       -
                 machine.wait_for_window("io.elementary.settings")

     

       96
       -
       

     

       97
       -
             with subtest("Open elementary terminal"):

     

       98
       -
                 machine.execute("su - ${user.name} -c 'DISPLAY=:0 io.elementary.terminal >&2 &'")

     

       99
       -
                 machine.wait_for_window("io.elementary.terminal")

     

       100
        
       

     

       101
        
             with subtest("Trigger multitasking view"):

     

       102
        
                 cmd = "dbus-send --session --dest=org.pantheon.gala --print-reply /org/pantheon/gala org.pantheon.gala.PerformAction int32:1"

     

       103
       -
                 env = "DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/${toString user.uid}/bus DISPLAY=:0"

     

       104
        
                 machine.succeed(f"su - ${user.name} -c '{env} {cmd}'")

     

       105
        
                 machine.sleep(5)

     

       106
        
                 machine.screenshot("multitasking")

     
···

       108
        
       

     

       109
        
             with subtest("Check if gala has ever coredumped"):

     

       110
        
                 machine.fail("coredumpctl --json=short | grep gala")

     

       111
       -
                 # So you can see the dock in the below screenshot.

     

       112
       -
                 machine.succeed("su - ${user.name} -c 'DISPLAY=:0 xdotool mousemove 450 1000 >&2 &'")

     

       113
        
                 machine.sleep(10)

     

       114
        
                 machine.screenshot("screen")

     

       115
        
           '';

···

       8
        
         nodes.machine =

     

       9
        
           { ... }:

     

       10
        
       

     

       11
       +
           let

     

       12
       +
             videosAutostart = pkgs.writeTextFile {

     

       13
       +
               name = "autostart-elementary-videos";

     

       14
       +
               destination = "/etc/xdg/autostart/io.elementary.videos.desktop";

     

       15
       +
               text = ''

     

       16
       +
                 [Desktop Entry]

     

       17
       +
                 Version=1.0

     

       18
       +
                 Name=Videos

     

       19
       +
                 Type=Application

     

       20
       +
                 Terminal=false

     

       21
       +
                 Exec=io.elementary.videos %U

     

       22
       +
               '';

     

       23
       +
             };

     

       24
       +
           in

     

       25
        
           {

     

       26
        
             imports = [ ./common/user-account.nix ];

     

       27
        
       

     
···

       29
        
             virtualisation.memorySize = 2047;

     

       30
        
       

     

       31
        
             services.xserver.enable = true;

     

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

     

       33
        
       

     

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

     

       35
        
             services.flatpak.enable = true;

     

       36
        
       

     

       37
       +
             # For basic OCR tests.

     

       38
       +
             environment.systemPackages = [ videosAutostart ];

     

       39
       +
       

     

       40
        
             # We don't ship gnome-text-editor in Pantheon module, we add this line mainly

     

       41
        
             # to catch eval issues related to this option.

     

       42
        
             environment.pantheon.excludePackages = [ pkgs.gnome-text-editor ];

     

       43
        
       

     

       44
       +
             programs.ydotool.enable = true;

     

       45
        
           };

     

       46
        
       

     

       47
        
         enableOCR = true;

     
···

       50
        
           { nodes, ... }:

     

       51
        
           let

     

       52
        
             user = nodes.machine.users.users.alice;

     

       0
        
       
     

       53
        
           in

     

       54
        
           ''

     

       55
        
             machine.wait_for_unit("display-manager.service")

     
···

       57
        
             with subtest("Test we can see usernames in elementary-greeter"):

     

       58
        
                 machine.wait_for_text("${user.description}")

     

       59
        
                 machine.wait_until_succeeds("pgrep -f io.elementary.greeter-compositor")

     

       0
        
       
     

       0
        
       
     

       60
        
                 # Ensure the password box is focused by clicking it.

     

       61
        
                 # Workaround for https://github.com/NixOS/nixpkgs/issues/211366.

     

       62
       +
                 machine.succeed("ydotool mousemove -a 220 275")

     

       63
       +
                 machine.succeed("ydotool click 0xC0")

     

       64
        
                 machine.sleep(2)

     

       65
        
                 machine.screenshot("elementary_greeter_lightdm")

     

       66
        
       

     

       67
        
             with subtest("Login with elementary-greeter"):

     

       68
        
                 machine.send_chars("${user.password}\n")

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       69
        
                 machine.wait_until_succeeds('journalctl -t gnome-session-binary --grep "Entering running state"')

     

       70
        
       

     

       71
       +
             with subtest("Wait for wayland server"):

     

       72
       +
                 machine.wait_for_file("/run/user/${toString user.uid}/wayland-0")

     

       73
       +
       

     

       74
        
             with subtest("Check that logging in has given the user ownership of devices"):

     

       75
        
                 machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}")

     

       76
        
       

     

       77
        
             with subtest("Check if Pantheon components actually start"):

     

       78
       +
                 # We specifically check gsd-xsettings here since it is manually pulled up by gala.

     

       79
       +
                 # https://github.com/elementary/gala/pull/2140

     

       80
       +
                 for i in ["gala", "io.elementary.wingpanel", "io.elementary.dock", "gsd-media-keys", "gsd-xsettings", "io.elementary.desktop.agent-polkit"]:

     

       81
        
                     machine.wait_until_succeeds(f"pgrep -f {i}")

     

       0
        
       
     

       0
        
       
     

       82
        
                 machine.wait_until_succeeds("pgrep -xf ${pkgs.pantheon.elementary-files}/libexec/io.elementary.files.xdg-desktop-portal")

     

       83
        
       

     

       84
        
             with subtest("Check if various environment variables are set"):

     

       85
        
                 cmd = "xargs --null --max-args=1 echo < /proc/$(pgrep -xf ${pkgs.pantheon.gala}/bin/gala)/environ"

     

       86
        
                 machine.succeed(f"{cmd} | grep 'XDG_CURRENT_DESKTOP' | grep 'Pantheon'")

     

       87
       +
                 machine.succeed(f"{cmd} | grep 'XDG_SESSION_TYPE' | grep 'wayland'")

     

       88
        
                 # Hopefully from the sessionPath option.

     

       89
        
                 machine.succeed(f"{cmd} | grep 'XDG_DATA_DIRS' | grep 'gsettings-schemas/pantheon-agent-geoclue2'")

     

       90
        
                 # Hopefully from login shell.

     
···

       92
        
                 # Hopefully from gcr-ssh-agent.

     

       93
        
                 machine.succeed(f"{cmd} | grep 'SSH_AUTH_SOCK' | grep 'gcr'")

     

       94
        
       

     

       95
       +
             with subtest("Wait for elementary videos autostart"):

     

       96
       +
                 machine.wait_until_succeeds("pgrep -f io.elementary.videos")

     

       0
        
       
     

       0
        
       
     

       97
        
                 machine.wait_for_text("No Videos Open")

     

       98
       +
                 machine.screenshot("videos")

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       99
        
       

     

       100
        
             with subtest("Trigger multitasking view"):

     

       101
        
                 cmd = "dbus-send --session --dest=org.pantheon.gala --print-reply /org/pantheon/gala org.pantheon.gala.PerformAction int32:1"

     

       102
       +
                 env = "DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/${toString user.uid}/bus"

     

       103
        
                 machine.succeed(f"su - ${user.name} -c '{env} {cmd}'")

     

       104
        
                 machine.sleep(5)

     

       105
        
                 machine.screenshot("multitasking")

     
···

       107
        
       

     

       108
        
             with subtest("Check if gala has ever coredumped"):

     

       109
        
                 machine.fail("coredumpctl --json=short | grep gala")

     

       110
       +
                 # So we can see the dock.

     

       111
       +
                 machine.execute("pkill -f -9 io.elementary.videos")

     

       112
        
                 machine.sleep(10)

     

       113
        
                 machine.screenshot("screen")

     

       114
        
           '';

+1 -1

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

···

       140
        
       

     

       141
        
         # Enable the Pantheon Desktop Environment.

     

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

     

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

     

       144
        
       

     

       145
        
       """

     

       146

···

       140
        
       

     

       141
        
         # Enable the Pantheon Desktop Environment.

     

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

     

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

     

       144
        
       

     

       145
        
       """

     

       146

+7 -3

pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix

···

       20
        
         gnome-settings-daemon,

     

       21
        
         mutter,

     

       22
        
         elementary-icon-theme,

     

       0
        
       
     

       23
        
         wingpanel-with-indicators,

     

       24
        
         elementary-gtk-theme,

     

       25
        
         nixos-artwork,

     
···

       33
        
       

     

       34
        
       stdenv.mkDerivation rec {

     

       35
        
         pname = "elementary-greeter";

     

       36
       -
         version = "8.0.1";

     

       0
        
       
     

       0
        
       
     

       37
        
       

     

       38
        
         src = fetchFromGitHub {

     

       39
        
           owner = "elementary";

     

       40
        
           repo = "greeter";

     

       41
       -
           rev = version;

     

       42
       -
           sha256 = "sha256-T/tI8WRVbTLdolDYa98M2Vm26p0xhGiai74lXAlpQ8k=";

     

       43
        
         };

     

       44
        
       

     

       45
        
         patches = [

     
···

       65
        
         buildInputs = [

     

       66
        
           accountsservice

     

       67
        
           elementary-icon-theme

     

       0
        
       
     

       68
        
           gala # for io.elementary.desktop.background

     

       69
        
           gnome-desktop

     

       70
        
           gnome-settings-daemon

···

       20
        
         gnome-settings-daemon,

     

       21
        
         mutter,

     

       22
        
         elementary-icon-theme,

     

       23
       +
         elementary-settings-daemon,

     

       24
        
         wingpanel-with-indicators,

     

       25
        
         elementary-gtk-theme,

     

       26
        
         nixos-artwork,

     
···

       34
        
       

     

       35
        
       stdenv.mkDerivation rec {

     

       36
        
         pname = "elementary-greeter";

     

       37
       +
         # To allow overriding last-session-type.

     

       38
       +
         # nixpkgs-update: no auto update

     

       39
       +
         version = "8.0.1-unstable-2025-09-14";

     

       40
        
       

     

       41
        
         src = fetchFromGitHub {

     

       42
        
           owner = "elementary";

     

       43
        
           repo = "greeter";

     

       44
       +
           rev = "2461ad1be4a4d0e541879abe869cf8911f505215";

     

       45
       +
           hash = "sha256-rDlaL2KCm0tz73cwHLgNAD7Ddbn1QFJVa+Syh5eTfWo=";

     

       46
        
         };

     

       47
        
       

     

       48
        
         patches = [

     
···

       68
        
         buildInputs = [

     

       69
        
           accountsservice

     

       70
        
           elementary-icon-theme

     

       71
       +
           elementary-settings-daemon

     

       72
        
           gala # for io.elementary.desktop.background

     

       73
        
           gnome-desktop

     

       74
        
           gnome-settings-daemon