···

       
39
       
 
       


     

       
40
       
 
       
      ${optionalString cfg.startDbusSession ''

     

       
41
       
 
       
        if test -z "$DBUS_SESSION_BUS_ADDRESS"; then

     

       
42
       
-
       
          ${config.systemd.package}/bin/systemctl --user start dbus.socket

     

       
43
       
-
       
          export `${config.systemd.package}/bin/systemctl --user show-environment | grep '^DBUS_SESSION_BUS_ADDRESS'`

     

       
44
       
 
       
        fi

     

       
45
       
 
       
      ''}

     

       
46
       
 
       


     
···

       
60
       
 
       
      #

     

       
61
       
 
       
      # Also tell systemd about the dbus session bus address.

     

       
62
       
 
       
      # This is required by user units using the session bus.

     

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

     

       
64
       
 
       


     

       
65
       
 
       
      # Load X defaults. This should probably be safe on wayland too.

     

       
66
       
 
       
      ${xorg.xrdb}/bin/xrdb -merge ${xresourcesXft}

     
···

       
89
       
 
       
      fi

     

       
90
       
 
       


     

       
91
       
 
       
      # Start systemd user services for graphical sessions

     

       
92
       
-
       
      ${config.systemd.package}/bin/systemctl --user start graphical-session.target

     

       
93
       
 
       


     

       
94
       
 
       
      # Allow the user to setup a custom session type.

     

       
95
       
 
       
      if test -x ~/.xsession; then

     
···

       
394
       
 
       


     

       
395
       
 
       
          test -n "$waitPID" && wait "$waitPID"

     

       
396
       
 
       


     

       
397
       
-
       
          ${config.systemd.package}/bin/systemctl --user stop graphical-session.target

     

       
398
       
 
       


     

       
399
       
 
       
          exit 0

     

       
400
       
 
       
        '';

     

···

       
39
       
 
       


     

       
40
       
 
       
      ${optionalString cfg.startDbusSession ''

     

       
41
       
 
       
        if test -z "$DBUS_SESSION_BUS_ADDRESS"; then

     

       
42
       
+
       
          /run/current-system/systemd/bin/systemctl --user start dbus.socket

     

       
43
       
+
       
          export `/run/current-system/systemd/bin/systemctl --user show-environment | grep '^DBUS_SESSION_BUS_ADDRESS'`

     

       
44
       
 
       
        fi

     

       
45
       
 
       
      ''}

     

       
46
       
 
       


     
···

       
60
       
 
       
      #

     

       
61
       
 
       
      # Also tell systemd about the dbus session bus address.

     

       
62
       
 
       
      # This is required by user units using the session bus.

     

       
63
       
+
       
      /run/current-system/systemd/bin/systemctl --user import-environment DISPLAY XAUTHORITY DBUS_SESSION_BUS_ADDRESS

     

       
64
       
 
       


     

       
65
       
 
       
      # Load X defaults. This should probably be safe on wayland too.

     

       
66
       
 
       
      ${xorg.xrdb}/bin/xrdb -merge ${xresourcesXft}

     
···

       
89
       
 
       
      fi

     

       
90
       
 
       


     

       
91
       
 
       
      # Start systemd user services for graphical sessions

     

       
92
       
+
       
      /run/current-system/systemd/bin/systemctl --user start graphical-session.target

     

       
93
       
 
       


     

       
94
       
 
       
      # Allow the user to setup a custom session type.

     

       
95
       
 
       
      if test -x ~/.xsession; then

     
···

       
394
       
 
       


     

       
395
       
 
       
          test -n "$waitPID" && wait "$waitPID"

     

       
396
       
 
       


     

       
397
       
+
       
          /run/current-system/systemd/bin/systemctl --user stop graphical-session.target

     

       
398
       
 
       


     

       
399
       
 
       
          exit 0

     

       
400
       
 
       
        '';