d3113a62b8
This partially reverts bf3d3dd19b.
I don't know why we weren't getting a default logfile back then but Xorg
definitely provides one now ($XDG_DATA_HOME for regular users and /var/log for
root, see `man Xorg`)
58 lines
1.6 KiB
Nix
58 lines
1.6 KiB
Nix
{ config, lib, pkgs, ... }:
|
|
|
|
with lib;
|
|
|
|
let
|
|
|
|
cfg = config.services.xserver.displayManager.startx;
|
|
|
|
in
|
|
|
|
{
|
|
|
|
###### interface
|
|
|
|
options = {
|
|
services.xserver.displayManager.startx = {
|
|
enable = mkOption {
|
|
type = types.bool;
|
|
default = false;
|
|
description = ''
|
|
Whether to enable the dummy "startx" pseudo-display manager,
|
|
which allows users to start X manually via the "startx" command
|
|
from a vt shell. The X server runs under the user's id, not as root.
|
|
The user must provide a ~/.xinitrc file containing session startup
|
|
commands, see startx(1). This is not automatically generated
|
|
from the desktopManager and windowManager settings.
|
|
'';
|
|
};
|
|
};
|
|
};
|
|
|
|
|
|
###### implementation
|
|
|
|
config = mkIf cfg.enable {
|
|
services.xserver = {
|
|
exportConfiguration = true;
|
|
displayManager.job.execCmd = "";
|
|
displayManager.lightdm.enable = lib.mkForce false;
|
|
};
|
|
systemd.services.display-manager.enable = false;
|
|
|
|
# Other displayManagers log to /dev/null because they're services and put
|
|
# Xorg's stdout in the journal
|
|
#
|
|
# To send log to Xorg's default log location ($XDG_DATA_HOME/xorg/), we do
|
|
# not specify a log file when running X
|
|
services.xserver.logFile = mkDefault null;
|
|
|
|
# Implement xserverArgs via xinit's system-wide xserverrc
|
|
environment.etc."X11/xinit/xserverrc".source = pkgs.writeShellScript "xserverrc" ''
|
|
exec ${pkgs.xorg.xorgserver}/bin/X ${toString config.services.xserver.displayManager.xserverArgs} "$@"
|
|
'';
|
|
environment.systemPackages = with pkgs; [ xorg.xinit ];
|
|
};
|
|
|
|
}
|