commit 3fcfcb8bcb5f390da45d12702bb1a7afb07287f3 · pyrox.dev/nixpkgs

+5 -5
nixos/modules/services/x11/display-managers/default.nix
···

       39
       39
        
       

     

       40
       40
        
             ${optionalString cfg.startDbusSession ''

     

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

     

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

     

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

     

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

     

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

     

       44
       44
        
               fi

     

       45
       45
        
             ''}

     

       46
       46
        
       

     
···

       60
       60
        
             #

     

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

     

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

     

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

     

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

     

       64
       64
        
       

     

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

     

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

     
···

       89
       89
        
             fi

     

       90
       90
        
       

     

       91
       91
        
             # Start systemd user services for graphical sessions

     

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

     

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

     

       93
       93
        
       

     

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

     

       95
       95
        
             if test -x ~/.xsession; then

     
···

       394
       394
        
       

     

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

     

       396
       396
        
       

     

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

     

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

     

       398
       398
        
       

     

       399
       399
        
                 exit 0

     

       400
       400
        
               '';