diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-06-19 14:51:04 -0400 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-06-19 14:51:04 -0400 |
| commit | dab6bbe3a691cafac994e1782d9141ddd1861f1b (patch) | |
| tree | 26a35051fd3b151d69b0c5d9e318d14fea3e5dad /modules/services/x11/xserver.nix | |
| parent | 2b305d7f294090e31da8e039ffbf90f03c41e526 (diff) | |
| download | nixlib-dab6bbe3a691cafac994e1782d9141ddd1861f1b.tar nixlib-dab6bbe3a691cafac994e1782d9141ddd1861f1b.tar.gz nixlib-dab6bbe3a691cafac994e1782d9141ddd1861f1b.tar.bz2 nixlib-dab6bbe3a691cafac994e1782d9141ddd1861f1b.tar.lz nixlib-dab6bbe3a691cafac994e1782d9141ddd1861f1b.tar.xz nixlib-dab6bbe3a691cafac994e1782d9141ddd1861f1b.tar.zst nixlib-dab6bbe3a691cafac994e1782d9141ddd1861f1b.zip | |
Set the default unit to "graphical.target" if X11 is enabled
Diffstat (limited to 'modules/services/x11/xserver.nix')
| -rw-r--r-- | modules/services/x11/xserver.nix | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix index 2ae42f5b41be..61af0459a6bd 100644 --- a/modules/services/x11/xserver.nix +++ b/modules/services/x11/xserver.nix @@ -377,15 +377,13 @@ in environment.pathsToLink = [ "/etc/xdg" "/share/xdg" "/share/applications" "/share/icons" "/share/pixmaps" ]; - jobs."xserver-start-check" = - { startOn = if cfg.autorun then "filesystem and stopped udevtrigger" else ""; - stopOn = ""; - task = true; - script = "grep -qv noX11 /proc/cmdline && start xserver || true"; - }; + boot.systemd.defaultUnit = mkIf cfg.autorun "graphical.target"; + + boot.systemd.services."xserver.service" = + { wantedBy = [ "graphical.target" ]; + after = [ "systemd-udev-settle.service" ]; - jobs.xserver = - { restartIfChanged = false; + #restartIfChanged = false; environment = { FONTCONFIG_FILE = "/etc/fonts/fonts.conf"; # !!! cleanup |