Rename xorg.target to graphical-session.target

Also make sure graphical-session.target is generated.
This commit is contained in:
Robert Helgesson 2017-01-09 22:45:42 +01:00
parent 06a24c37e5
commit dd0e71d686
No known key found for this signature in database
GPG key ID: C3DB11069E65DC86
9 changed files with 19 additions and 11 deletions

View file

@ -22,7 +22,7 @@ with lib;
};
Install = {
WantedBy = [ "xorg.target" ];
WantedBy = [ "graphical-session.target" ];
};
Service = {

View file

@ -45,7 +45,7 @@ in
};
Install = {
WantedBy = [ "xorg.target" ];
WantedBy = [ "graphical-session.target" ];
};
};
};

View file

@ -16,7 +16,7 @@ with lib;
};
Install = {
WantedBy = [ "xorg.target" ];
WantedBy = [ "graphical-session.target" ];
};
Service = {

View file

@ -16,7 +16,7 @@ with lib;
};
Install = {
WantedBy = [ "xorg.target" ];
WantedBy = [ "graphical-session.target" ];
};
Service = {

View file

@ -51,7 +51,7 @@ in
};
Install = {
WantedBy = [ "xorg.target" ];
WantedBy = [ "graphical-session.target" ];
};
};
}

View file

@ -34,7 +34,7 @@ in
};
Install = {
WantedBy = [ "xorg.target" ];
WantedBy = [ "graphical-session.target" ];
};
};
};

View file

@ -22,7 +22,7 @@ with lib;
};
Install = {
WantedBy = [ "xorg.target" ];
WantedBy = [ "graphical-session.target" ];
};
};
};

View file

@ -20,7 +20,7 @@ with lib;
};
Install = {
WantedBy = [ "xorg.target" ];
WantedBy = [ "graphical-session.target" ];
};
};
};

View file

@ -34,7 +34,7 @@ in
};
Install = {
WantedBy = [ "xorg.target" ];
WantedBy = [ "graphical-session.target" ];
};
Service = {
@ -53,6 +53,14 @@ in
};
};
# A basic graphical session target. Apparently this will come
# standard in future Systemd versions.
systemd.user.targets.graphical-session = {
Unit = {
Description = "Graphical session";
};
};
home.file.".xsession" = {
mode = "555";
text = ''
@ -64,13 +72,13 @@ in
systemctl --user import-environment SSH_AUTH_SOCK
systemctl --user import-environment XDG_DATA_DIRS
systemctl --user import-environment XDG_RUNTIME_DIR
systemctl --user start xorg.target
systemctl --user start graphical-session.target
${cfg.initExtra}
${cfg.windowManager}
systemctl --user stop xorg.target
systemctl --user stop graphical-session.target
'';
};
};