commit 9fad9fb8698fd13f52004b73788ba462906b6c85 · pyrox.dev/nixpkgs

+31 -38

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

···

       27
       27
        
           Xft.hintstyle: hintslight

     

       28
       28
        
         '';

     

       29
       29
        
       

     

       30
       30
       -
         # file provided by services.xserver.displayManager.session.script

     

       31
       31
       -
         xsession = wm: dm: pkgs.writeScript "xsession"

     

       30
       30
       +
         # file provided by services.xserver.displayManager.session.wrapper

     

       31
       31
       +
         xsessionWrapper = pkgs.writeScript "xsession-wrapper"

     

       32
       32
        
           ''

     

       33
       33
        
             #! ${pkgs.bash}/bin/bash

     

       34
       34
        
       

     

       35
       35
       -
             # Expected parameters:

     

       36
       36
       -
             #   $1 = <desktop-manager>+<window-manager>

     

       37
       37
       -
       

     

       38
       38
       -
             # Actual parameters (FIXME):

     

       39
       39
       -
             # SDDM is calling this script like the following:

     

       40
       40
       -
             #   $1 = /nix/store/xxx-xsession (= $0)

     

       41
       41
       -
             #   $2 = <desktop-manager>+<window-manager>

     

       42
       42
       -
             # SLiM is using the following parameter:

     

       43
       43
       -
             #   $1 = /nix/store/xxx-xsession <desktop-manager>+<window-manager>

     

       44
       44
       -
             # LightDM keeps the double quotes:

     

       45
       45
       -
             #   $1 = /nix/store/xxx-xsession "<desktop-manager>+<window-manager>"

     

       46
       46
       -
             # The fake/auto display manager doesn't use any parameters and GDM is

     

       47
       47
       -
             # broken.

     

       48
       48
       -
             # If you want to "debug" this script don't print the parameters to stdout

     

       49
       49
       -
             # or stderr because this script will be executed multiple times and the

     

       50
       50
       -
             # output won't be visible in the log when the script is executed for the

     

       51
       51
       -
             # first time (e.g. append them to a file instead)!

     

       52
       52
       -
       

     

       53
       53
       -
             # All of the above cases are handled by the following hack (FIXME).

     

       54
       54
       -
             # Since this line is *very important* for *all display managers* it is

     

       55
       55
       -
             # very important to test changes to the following line with all display

     

       56
       56
       -
             # managers:

     

       57
       57
       -
             if [ "''${1:0:1}" = "/" ]; then eval exec "$1" "$2" ; fi

     

       58
       58
       -
       

     

       59
       59
       -
             # Now it should be safe to assume that the script was called with the

     

       60
       60
       -
             # expected parameters.

     

       35
       35
       +
             # Shared environment setup for graphical sessions.

     

       61
       36
        
       

     

       62
       37
        
             . /etc/profile

     

       63
       38
        
             cd "$HOME"

     

       64
       64
       -
       

     

       65
       65
       -
             # The first argument of this script is the session type.

     

       66
       66
       -
             sessionType="$1"

     

       67
       67
       -
             if [ "$sessionType" = default ]; then sessionType=""; fi

     

       68
       39
        
       

     

       69
       40
        
             ${optionalString cfg.startDbusSession ''

     

       70
       41
        
               if test -z "$DBUS_SESSION_BUS_ADDRESS"; then

     

       71
       71
       -
                 exec ${pkgs.dbus.dbus-launch} --exit-with-session "$0" "$sessionType"

     

       42
       42
       +
                 exec ${pkgs.dbus.dbus-launch} --exit-with-session "$0" "$@"

     

       72
       43
        
               fi

     

       73
       44
        
             ''}

     

       74
       45
        
       

     

       75
       46
        
             ${optionalString cfg.displayManager.job.logToJournal ''

     

       76
       47
        
               if [ -z "$_DID_SYSTEMD_CAT" ]; then

     

       77
       48
        
                 export _DID_SYSTEMD_CAT=1

     

       78
       78
       -
                 exec ${config.systemd.package}/bin/systemd-cat -t xsession "$0" "$sessionType"

     

       49
       49
       +
                 exec ${config.systemd.package}/bin/systemd-cat -t xsession "$0" "$@"

     

       79
       50
        
               fi

     

       80
       51
        
             ''}

     

       81
       52
        
       

     
···

       101
       72
        
             ${config.systemd.package}/bin/systemctl --user import-environment DISPLAY XAUTHORITY DBUS_SESSION_BUS_ADDRESS

     

       102
       73
        
       

     

       103
       74
        
             # Load X defaults.

     

       75
       75
       +
             # FIXME: Check XDG_SESSION_TYPE against x11

     

       104
       76
        
             ${xorg.xrdb}/bin/xrdb -merge ${xresourcesXft}

     

       105
       77
        
             if test -e ~/.Xresources; then

     

       106
       78
        
                 ${xorg.xrdb}/bin/xrdb -merge ~/.Xresources

     
···

       132
       104
        
             # Allow the user to setup a custom session type.

     

       133
       105
        
             if test -x ~/.xsession; then

     

       134
       106
        
                 exec ~/.xsession

     

       107
       107
       +
             fi

     

       108
       108
       +
       

     

       109
       109
       +
             if test "$1"; then

     

       110
       110
       +
                 # Run the supplied session command. Remove any double quotes with eval.

     

       111
       111
       +
                 eval exec "$@"

     

       135
       112
        
             else

     

       136
       136
       -
                 if test "$sessionType" = "custom"; then

     

       137
       137
       -
                     sessionType="" # fall-thru if there is no ~/.xsession

     

       138
       138
       -
                 fi

     

       113
       113
       +
                 # Fall back to the default window/desktopManager

     

       114
       114
       +
                 exec ${cfg.displayManager.session.script}

     

       139
       115
        
             fi

     

       116
       116
       +
           '';

     

       117
       117
       +
       

     

       118
       118
       +
         # file provided by services.xserver.displayManager.session.script

     

       119
       119
       +
         xsession = wm: dm: pkgs.writeScript "xsession"

     

       120
       120
       +
           ''

     

       121
       121
       +
             #! ${pkgs.bash}/bin/bash

     

       122
       122
       +
       

     

       123
       123
       +
             # Legacy session script used to construct .desktop files from

     

       124
       124
       +
             # `services.xserver.displayManager.session` entries. Called from

     

       125
       125
       +
             # `sessionWrapper`.

     

       126
       126
       +
       

     

       127
       127
       +
             # Expected parameters:

     

       128
       128
       +
             #   $1 = <desktop-manager>+<window-manager>

     

       129
       129
       +
       

     

       130
       130
       +
             # The first argument of this script is the session type.

     

       131
       131
       +
             sessionType="$1"

     

       132
       132
       +
             if [ "$sessionType" = default ]; then sessionType=""; fi

     

       140
       133
        
       

     

       141
       134
        
             # The session type is "<desktop-manager>+<window-manager>", so

     

       142
       135
        
             # extract those (see:

     
···

       194
       187
        
               Type=XSession

     

       195
       188
        
               TryExec=${cfg.displayManager.session.script}

     

       196
       189
        
               Exec=${cfg.displayManager.session.script} "${n}"

     

       197
       197
       -
               X-GDM-BypassXsession=true

     

       198
       190
        
               Name=${n}

     

       199
       191
        
               Comment=

     

       200
       192
        
               EODESKTOP

     
···

       292
       284
        
                     (filter (w: d.name != "none" || w.name != "none") wm));

     

       293
       285
        
                 desktops = mkDesktops names;

     

       294
       286
        
                 script = xsession wm dm;

     

       287
       287
       +
                 wrapper = xsessionWrapper;

     

       295
       288
        
               };

     

       296
       289
        
             };

     

       297
       290

+1 -1

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

···

       173
       173
        
             ${optionalString cfg.gdm.debug "Enable=true"}

     

       174
       174
        
           '';

     

       175
       175
        
       

     

       176
       176
       -
           environment.etc."gdm/Xsession".source = "${pkgs.gnome3.gdm}/etc/gdm/Xsession";

     

       176
       176
       +
           environment.etc."gdm/Xsession".source = config.services.xserver.displayManager.session.wrapper;

     

       177
       177
        
       

     

       178
       178
        
           # GDM LFS PAM modules, adapted somehow to NixOS

     

       179
       179
        
           security.pam.services = {

+1 -1

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

···

       49
       49
        
       

     

       50
       50
        
             [Seat:*]

     

       51
       51
        
             xserver-command = ${xserverWrapper}

     

       52
       52
       -
             session-wrapper = ${dmcfg.session.script}

     

       52
       52
       +
             session-wrapper = ${dmcfg.session.wrapper}

     

       53
       53
        
             ${optionalString cfg.greeter.enable ''

     

       54
       54
        
               greeter-session = ${cfg.greeter.name}

     

       55
       55
        
             ''}

+1 -1

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

···

       49
       49
        
           MinimumVT=${toString (if xcfg.tty != null then xcfg.tty else 7)}

     

       50
       50
        
           ServerPath=${xserverWrapper}

     

       51
       51
        
           XephyrPath=${pkgs.xorg.xorgserver.out}/bin/Xephyr

     

       52
       52
       -
           SessionCommand=${dmcfg.session.script}

     

       52
       52
       +
           SessionCommand=${dmcfg.session.wrapper}

     

       53
       53
        
           SessionDir=${dmcfg.session.desktops}/share/xsessions

     

       54
       54
        
           XauthPath=${pkgs.xorg.xauth}/bin/xauth

     

       55
       55
        
           DisplayCommand=${Xsetup}

+1 -1

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

···

       14
       14
        
             default_xserver ${dmcfg.xserverBin}

     

       15
       15
        
             xserver_arguments ${toString dmcfg.xserverArgs}

     

       16
       16
        
             sessiondir ${dmcfg.session.desktops}/share/xsessions

     

       17
       17
       -
             login_cmd exec ${pkgs.runtimeShell} ${dmcfg.session.script} "%session"

     

       17
       17
       +
             login_cmd exec ${pkgs.runtimeShell} ${dmcfg.session.wrapper} "%session"

     

       18
       18
        
             halt_cmd ${config.systemd.package}/sbin/shutdown -h now

     

       19
       19
        
             reboot_cmd ${config.systemd.package}/sbin/shutdown -r now

     

       20
       20
        
             logfile /dev/stderr