commit e96d5c13d06932e0a6fca5d0ec2224ff5f54b852 · pyrox.dev/nixpkgs

+28 -2

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

···

       174
       174
        
               # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1443

     

       175
       175
        
               pkgs.pantheon.mutter

     

       176
       176
        
             ];

     

       177
       177
       -
             systemd.packages = [

     

       178
       178
       -
               pkgs.pantheon.gnome-settings-daemon

     

       177
       177
       +
             systemd.packages = with pkgs; [

     

       178
       178
       +
               gnome.gnome-session

     

       179
       179
       +
               pantheon.gala

     

       180
       180
       +
               pantheon.gnome-settings-daemon

     

       181
       181
       +
               pantheon.elementary-session-settings

     

       179
       182
        
             ];

     

       180
       183
        
             programs.dconf.enable = true;

     

       181
       184
        
             networking.networkmanager.enable = mkDefault true;

     

       185
       185
       +
       

     

       186
       186
       +
             systemd.user.targets."gnome-session-x11-services".wants = [

     

       187
       187
       +
               "org.gnome.SettingsDaemon.XSettings.service"

     

       188
       188
       +
             ];

     

       189
       189
       +
             systemd.user.targets."gnome-session-x11-services-ready".wants = [

     

       190
       190
       +
               "org.gnome.SettingsDaemon.XSettings.service"

     

       191
       191
       +
             ];

     

       192
       192
       +
       

     

       193
       193
       +
             # https://github.com/elementary/gala/issues/1826#issuecomment-1890461298

     

       194
       194
       +
             systemd.user.services."io.elementary.gala.daemon@" = {

     

       195
       195
       +
               unitConfig = {

     

       196
       196
       +
                 Description = "Gala Daemon";

     

       197
       197
       +
                 BindsTo = "io.elementary.gala@.service";

     

       198
       198
       +
                 After = "io.elementary.gala@.service";

     

       199
       199
       +
               };

     

       200
       200
       +
       

     

       201
       201
       +
               serviceConfig = {

     

       202
       202
       +
                 Type = "dbus";

     

       203
       203
       +
                 BusName = "org.pantheon.gala.daemon";

     

       204
       204
       +
                 ExecStart = "${pkgs.pantheon.gala}/bin/gala-daemon";

     

       205
       205
       +
                 Slice = "session.slice";

     

       206
       206
       +
               };

     

       207
       207
       +
             };

     

       182
       208
        
       

     

       183
       209
        
             # Global environment

     

       184
       210
        
             environment.systemPackages = (with pkgs.pantheon; [

+1 -1

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

···

       40
       40
        
               IFS=:

     

       41
       41
        
               for i in $XDG_CURRENT_DESKTOP; do

     

       42
       42
        
                 case $i in

     

       43
       43
       -
                   KDE|GNOME|X-NIXOS-SYSTEMD-AWARE) echo "1"; exit; ;;

     

       43
       43
       +
                   KDE|GNOME|Pantheon|X-NIXOS-SYSTEMD-AWARE) echo "1"; exit; ;;

     

       44
       44
        
                   *) ;;

     

       45
       45
        
                 esac

     

       46
       46
        
               done

+3 -3

nixos/tests/pantheon.nix

···

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

     

       51
       51
        
               for i in ["gala", "io.elementary.wingpanel", "plank"]:

     

       52
       52
        
                   machine.wait_for_window(i)

     

       53
       53
       -
               machine.wait_for_unit("bamfdaemon.service", "${user.name}")

     

       54
       54
       -
               machine.wait_for_unit("io.elementary.files.xdg-desktop-portal.service", "${user.name}")

     

       53
       53
       +
               for i in ["io.elementary.gala.daemon@x11.service", "bamfdaemon.service", "io.elementary.files.xdg-desktop-portal.service"]:

     

       54
       54
       +
                   machine.wait_for_unit(i, "${user.name}")

     

       55
       55
        
       

     

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

     

       57
       57
       -
               cmd = "xargs --null --max-args=1 echo < /proc/$(pgrep -xf /run/current-system/sw/bin/gala)/environ"

     

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

     

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

     

       59
       59
        
               # Hopefully from the sessionPath option.

     

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

+1 -1

pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix

···

       72
       72
        
           export XDG_DATA_DIRS=@out@/share:$XDG_DATA_DIRS

     

       73
       73
        
       

     

       74
       74
        
           # Start pantheon session. Keep in sync with upstream

     

       75
       75
       -
           exec ${gnome-session}/bin/gnome-session --builtin --session=pantheon "$@"

     

       75
       75
       +
           exec ${gnome-session}/bin/gnome-session --session=pantheon "$@"

     

       76
       76
        
         '';

     

       77
       77
        
       

     

       78
       78
        
         # Absolute path patched version of the upstream xsession

+3

pkgs/desktops/pantheon/desktop/gala/default.nix

···

       70
       70
        
         postPatch = ''

     

       71
       71
        
           chmod +x build-aux/meson/post_install.py

     

       72
       72
        
           patchShebangs build-aux/meson/post_install.py

     

       73
       73
       +
       

     

       74
       74
       +
           # https://github.com/elementary/gala/issues/1826#issuecomment-1890461298

     

       75
       75
       +
           sed '2i Wants=io.elementary.gala.daemon@.service' -i 'data/gala@x11.service.in'

     

       73
       76
        
         '';

     

       74
       77
        
       

     

       75
       78
        
         passthru = {