2014-04-14 15:26:48 +01:00
|
|
|
|
{ config, lib, pkgs, pkgs_i686, ... }:
|
2006-11-28 22:27:56 +00:00
|
|
|
|
|
2014-04-14 15:26:48 +01:00
|
|
|
|
with lib;
|
2009-05-24 19:28:30 +01:00
|
|
|
|
|
2009-01-02 16:07:21 +00:00
|
|
|
|
let
|
2006-11-28 22:27:56 +00:00
|
|
|
|
|
2009-09-10 13:37:33 +01:00
|
|
|
|
kernelPackages = config.boot.kernelPackages;
|
2006-11-28 22:27:56 +00:00
|
|
|
|
|
2008-01-04 10:54:33 +00:00
|
|
|
|
# Abbreviations.
|
|
|
|
|
cfg = config.services.xserver;
|
2009-09-10 13:37:33 +01:00
|
|
|
|
xorg = pkgs.xorg;
|
|
|
|
|
|
2008-01-04 10:54:33 +00:00
|
|
|
|
|
2014-04-29 13:16:34 +01:00
|
|
|
|
# Map video driver names to driver packages. FIXME: move into card-specific modules.
|
2008-10-10 17:45:56 +01:00
|
|
|
|
knownVideoDrivers = {
|
2010-05-18 20:36:11 +01:00
|
|
|
|
ati_unfree = { modules = [ kernelPackages.ati_drivers_x11 ]; driverName = "fglrx"; };
|
2012-03-20 16:29:22 +00:00
|
|
|
|
nouveau = { modules = [ pkgs.xf86_video_nouveau ]; };
|
2009-11-06 00:59:03 +00:00
|
|
|
|
unichrome = { modules = [ pkgs.xorgVideoUnichrome ]; };
|
2009-11-06 09:22:00 +00:00
|
|
|
|
virtualbox = { modules = [ kernelPackages.virtualboxGuestAdditions ]; driverName = "vboxvideo"; };
|
2014-03-16 17:46:20 +00:00
|
|
|
|
ati = { modules = [ pkgs.xorg.xf86videoati pkgs.xorg.glamoregl ]; };
|
2014-03-23 20:28:14 +00:00
|
|
|
|
intel-testing = { modules = with pkgs.xorg; [ xf86videointel-testing glamoregl ]; driverName = "intel"; };
|
2008-10-10 17:45:56 +01:00
|
|
|
|
};
|
|
|
|
|
|
2008-08-27 11:00:49 +01:00
|
|
|
|
fontsForXServer =
|
2009-09-10 13:37:33 +01:00
|
|
|
|
config.fonts.fonts ++
|
2008-08-27 11:00:49 +01:00
|
|
|
|
# We don't want these fonts in fonts.conf, because then modern,
|
|
|
|
|
# fontconfig-based applications will get horrible bitmapped
|
|
|
|
|
# Helvetica fonts. It's better to get a substitution (like Nimbus
|
|
|
|
|
# Sans) than that horror. But we do need the Adobe fonts for some
|
|
|
|
|
# old non-fontconfig applications. (Possibly this could be done
|
|
|
|
|
# better using a fontconfig rule.)
|
|
|
|
|
[ pkgs.xorg.fontadobe100dpi
|
|
|
|
|
pkgs.xorg.fontadobe75dpi
|
|
|
|
|
];
|
2009-06-26 00:29:49 +01:00
|
|
|
|
|
2013-01-24 12:06:32 +00:00
|
|
|
|
|
2013-01-09 23:31:08 +00:00
|
|
|
|
# Just enumerate all heads without discarding XRandR output information.
|
|
|
|
|
xrandrHeads = let
|
|
|
|
|
mkHead = num: output: {
|
|
|
|
|
name = "multihead${toString num}";
|
|
|
|
|
inherit output;
|
|
|
|
|
};
|
|
|
|
|
in imap mkHead cfg.xrandrHeads;
|
|
|
|
|
|
|
|
|
|
xrandrDeviceSection = flip concatMapStrings xrandrHeads (h: ''
|
|
|
|
|
Option "monitor-${h.output}" "${h.name}"
|
|
|
|
|
'');
|
|
|
|
|
|
|
|
|
|
# Here we chain every monitor from the left to right, so we have:
|
|
|
|
|
# m4 right of m3 right of m2 right of m1 .----.----.----.----.
|
|
|
|
|
# Which will end up in reverse ----------> | m1 | m2 | m3 | m4 |
|
|
|
|
|
# `----^----^----^----'
|
|
|
|
|
xrandrMonitorSections = let
|
|
|
|
|
mkMonitor = previous: current: previous ++ singleton {
|
|
|
|
|
inherit (current) name;
|
|
|
|
|
value = ''
|
|
|
|
|
Section "Monitor"
|
|
|
|
|
Identifier "${current.name}"
|
|
|
|
|
${optionalString (previous != []) ''
|
|
|
|
|
Option "RightOf" "${(head previous).name}"
|
|
|
|
|
''}
|
|
|
|
|
EndSection
|
|
|
|
|
'';
|
|
|
|
|
};
|
|
|
|
|
monitors = foldl mkMonitor [] xrandrHeads;
|
|
|
|
|
in concatMapStrings (getAttr "value") monitors;
|
2009-06-26 00:29:49 +01:00
|
|
|
|
|
2009-09-10 13:37:33 +01:00
|
|
|
|
configFile = pkgs.stdenv.mkDerivation {
|
2006-11-28 22:27:56 +00:00
|
|
|
|
name = "xserver.conf";
|
2009-09-10 13:37:33 +01:00
|
|
|
|
|
|
|
|
|
xfs = optionalString (cfg.useXFS != false)
|
2008-01-04 10:28:12 +00:00
|
|
|
|
''FontPath "${toString cfg.useXFS}"'';
|
2007-12-25 12:16:38 +00:00
|
|
|
|
|
2009-09-10 13:37:33 +01:00
|
|
|
|
inherit (cfg) config;
|
|
|
|
|
|
|
|
|
|
buildCommand =
|
|
|
|
|
''
|
|
|
|
|
echo 'Section "Files"' >> $out
|
|
|
|
|
echo $xfs >> $out
|
|
|
|
|
|
|
|
|
|
for i in ${toString fontsForXServer}; do
|
|
|
|
|
if test "''${i:0:''${#NIX_STORE}}" == "$NIX_STORE"; then
|
|
|
|
|
for j in $(find $i -name fonts.dir); do
|
|
|
|
|
echo " FontPath \"$(dirname $j)\"" >> $out
|
|
|
|
|
done
|
|
|
|
|
fi
|
|
|
|
|
done
|
2011-09-14 19:20:50 +01:00
|
|
|
|
|
2009-09-10 13:37:33 +01:00
|
|
|
|
for i in $(find ${toString cfg.modules} -type d); do
|
|
|
|
|
if test $(echo $i/*.so* | wc -w) -ne 0; then
|
|
|
|
|
echo " ModulePath \"$i\"" >> $out
|
|
|
|
|
fi
|
|
|
|
|
done
|
|
|
|
|
|
|
|
|
|
echo 'EndSection' >> $out
|
2011-09-14 19:20:50 +01:00
|
|
|
|
|
2009-09-10 13:37:33 +01:00
|
|
|
|
echo "$config" >> $out
|
|
|
|
|
''; # */
|
2006-11-28 22:27:56 +00:00
|
|
|
|
};
|
|
|
|
|
|
2009-01-02 16:07:21 +00:00
|
|
|
|
in
|
|
|
|
|
|
2009-09-10 13:37:33 +01:00
|
|
|
|
{
|
2009-05-15 08:51:51 +01:00
|
|
|
|
|
2009-09-10 13:37:33 +01:00
|
|
|
|
imports =
|
|
|
|
|
[ ./display-managers/default.nix
|
|
|
|
|
./window-managers/default.nix
|
|
|
|
|
./desktop-managers/default.nix
|
|
|
|
|
];
|
2009-05-15 08:51:51 +01:00
|
|
|
|
|
2009-01-02 16:07:21 +00:00
|
|
|
|
|
2009-09-10 13:37:33 +01:00
|
|
|
|
###### interface
|
2011-09-14 19:20:50 +01:00
|
|
|
|
|
2009-09-10 13:37:33 +01:00
|
|
|
|
options = {
|
2011-09-14 19:20:50 +01:00
|
|
|
|
|
2009-09-10 13:37:33 +01:00
|
|
|
|
services.xserver = {
|
|
|
|
|
|
|
|
|
|
enable = mkOption {
|
2013-10-30 16:37:45 +00:00
|
|
|
|
type = types.bool;
|
2009-09-10 13:37:33 +01:00
|
|
|
|
default = false;
|
|
|
|
|
description = ''
|
|
|
|
|
Whether to enable the X server.
|
|
|
|
|
'';
|
|
|
|
|
};
|
2009-01-25 15:49:08 +00:00
|
|
|
|
|
2009-09-10 13:37:33 +01:00
|
|
|
|
autorun = mkOption {
|
2013-10-30 16:37:45 +00:00
|
|
|
|
type = types.bool;
|
2009-09-10 13:37:33 +01:00
|
|
|
|
default = true;
|
|
|
|
|
description = ''
|
|
|
|
|
Whether to start the X server automatically.
|
|
|
|
|
'';
|
|
|
|
|
};
|
2009-01-02 16:07:21 +00:00
|
|
|
|
|
2009-09-10 13:37:33 +01:00
|
|
|
|
exportConfiguration = mkOption {
|
2013-10-30 16:37:45 +00:00
|
|
|
|
type = types.bool;
|
2009-09-10 13:37:33 +01:00
|
|
|
|
default = false;
|
|
|
|
|
description = ''
|
|
|
|
|
Whether to symlink the X server configuration under
|
|
|
|
|
<filename>/etc/X11/xorg.conf</filename>.
|
|
|
|
|
'';
|
|
|
|
|
};
|
2009-01-02 16:07:21 +00:00
|
|
|
|
|
2009-09-10 13:37:33 +01:00
|
|
|
|
enableTCP = mkOption {
|
2013-10-30 16:37:45 +00:00
|
|
|
|
type = types.bool;
|
2009-09-10 13:37:33 +01:00
|
|
|
|
default = false;
|
|
|
|
|
description = ''
|
|
|
|
|
Whether to allow the X server to accept TCP connections.
|
|
|
|
|
'';
|
|
|
|
|
};
|
2009-01-02 16:07:39 +00:00
|
|
|
|
|
2009-09-10 13:37:33 +01:00
|
|
|
|
modules = mkOption {
|
2013-10-30 16:37:45 +00:00
|
|
|
|
type = types.listOf types.path;
|
2009-09-10 13:37:33 +01:00
|
|
|
|
default = [];
|
2014-08-27 22:41:15 +01:00
|
|
|
|
example = literalExample "[ pkgs.xf86_input_wacom ]";
|
2009-09-10 13:37:33 +01:00
|
|
|
|
description = "Packages to be added to the module search path of the X server.";
|
|
|
|
|
};
|
2009-01-02 16:07:21 +00:00
|
|
|
|
|
2009-09-10 13:37:33 +01:00
|
|
|
|
resolutions = mkOption {
|
2013-10-30 16:37:45 +00:00
|
|
|
|
type = types.listOf types.attrs;
|
2009-11-06 00:59:03 +00:00
|
|
|
|
default = [];
|
2010-08-09 21:10:16 +01:00
|
|
|
|
example = [ { x = 1600; y = 1200; } { x = 1024; y = 786; } ];
|
2009-09-10 13:37:33 +01:00
|
|
|
|
description = ''
|
2009-11-06 00:59:03 +00:00
|
|
|
|
The screen resolutions for the X server. The first element
|
|
|
|
|
is the default resolution. If this list is empty, the X
|
|
|
|
|
server will automatically configure the resolution.
|
2009-09-10 13:37:33 +01:00
|
|
|
|
'';
|
|
|
|
|
};
|
2009-01-02 16:07:21 +00:00
|
|
|
|
|
2014-04-29 11:58:54 +01:00
|
|
|
|
videoDrivers = mkOption {
|
|
|
|
|
type = types.listOf types.str;
|
|
|
|
|
# !!! We'd like "nv" here, but it segfaults the X server.
|
2014-05-21 14:40:48 +01:00
|
|
|
|
default = [ "ati" "cirrus" "intel" "vesa" "vmware" "modesetting" ];
|
2014-04-29 11:58:54 +01:00
|
|
|
|
example = [ "vesa" ];
|
|
|
|
|
description = ''
|
|
|
|
|
The names of the video drivers the configuration
|
|
|
|
|
supports. They will be tried in order until one that
|
|
|
|
|
supports your card is found.
|
|
|
|
|
'';
|
|
|
|
|
};
|
|
|
|
|
|
2009-09-10 13:37:33 +01:00
|
|
|
|
videoDriver = mkOption {
|
2013-10-30 16:37:45 +00:00
|
|
|
|
type = types.nullOr types.str;
|
2009-11-06 00:59:03 +00:00
|
|
|
|
default = null;
|
2009-09-10 13:37:33 +01:00
|
|
|
|
example = "i810";
|
|
|
|
|
description = ''
|
2009-11-06 00:59:03 +00:00
|
|
|
|
The name of the video driver for your graphics card. This
|
|
|
|
|
option is obsolete; please set the
|
2014-04-29 11:58:54 +01:00
|
|
|
|
<option>services.xserver.videoDrivers</option> instead.
|
2009-09-10 13:37:33 +01:00
|
|
|
|
'';
|
|
|
|
|
};
|
2009-01-02 16:07:21 +00:00
|
|
|
|
|
2014-04-29 13:16:34 +01:00
|
|
|
|
drivers = mkOption {
|
|
|
|
|
type = types.listOf types.attrs;
|
|
|
|
|
internal = true;
|
|
|
|
|
description = ''
|
|
|
|
|
A list of attribute sets specifying drivers to be loaded by
|
|
|
|
|
the X11 server.
|
|
|
|
|
'';
|
|
|
|
|
};
|
|
|
|
|
|
2013-01-30 19:22:40 +00:00
|
|
|
|
vaapiDrivers = mkOption {
|
2013-10-30 16:37:45 +00:00
|
|
|
|
type = types.listOf types.path;
|
2013-02-04 14:48:28 +00:00
|
|
|
|
default = [ ];
|
2014-08-27 22:41:15 +01:00
|
|
|
|
example = literalExample "[ pkgs.vaapiIntel pkgs.vaapiVdpau ]";
|
2013-01-30 19:22:40 +00:00
|
|
|
|
description = ''
|
2013-02-04 14:48:28 +00:00
|
|
|
|
Packages providing libva acceleration drivers.
|
2013-01-30 19:22:40 +00:00
|
|
|
|
'';
|
|
|
|
|
};
|
|
|
|
|
|
2009-11-21 22:14:01 +00:00
|
|
|
|
startGnuPGAgent = mkOption {
|
2013-10-30 16:37:45 +00:00
|
|
|
|
type = types.bool;
|
2009-11-22 14:34:53 +00:00
|
|
|
|
default = false;
|
2009-11-21 22:14:01 +00:00
|
|
|
|
description = ''
|
|
|
|
|
Whether to start the GnuPG agent when you log in. The GnuPG agent
|
|
|
|
|
remembers private keys for you so that you don't have to type in
|
|
|
|
|
passphrases every time you make an SSH connection or sign/encrypt
|
|
|
|
|
data. Use <command>ssh-add</command> to add a key to the agent.
|
|
|
|
|
'';
|
|
|
|
|
};
|
|
|
|
|
|
2009-09-10 13:37:33 +01:00
|
|
|
|
layout = mkOption {
|
2013-10-30 16:37:45 +00:00
|
|
|
|
type = types.str;
|
2009-09-10 13:37:33 +01:00
|
|
|
|
default = "us";
|
|
|
|
|
description = ''
|
|
|
|
|
Keyboard layout.
|
|
|
|
|
'';
|
2009-01-25 15:49:08 +00:00
|
|
|
|
};
|
|
|
|
|
|
2009-09-10 13:37:33 +01:00
|
|
|
|
xkbModel = mkOption {
|
2013-10-30 16:37:45 +00:00
|
|
|
|
type = types.str;
|
2009-09-10 13:37:33 +01:00
|
|
|
|
default = "pc104";
|
|
|
|
|
example = "presario";
|
|
|
|
|
description = ''
|
|
|
|
|
Keyboard model.
|
|
|
|
|
'';
|
|
|
|
|
};
|
2009-06-26 00:29:49 +01:00
|
|
|
|
|
2009-09-10 13:37:33 +01:00
|
|
|
|
xkbOptions = mkOption {
|
2013-10-30 16:37:45 +00:00
|
|
|
|
type = types.str;
|
2010-08-10 13:37:39 +01:00
|
|
|
|
default = "terminate:ctrl_alt_bksp";
|
2009-09-10 13:37:33 +01:00
|
|
|
|
example = "grp:caps_toggle, grp_led:scroll";
|
|
|
|
|
description = ''
|
|
|
|
|
X keyboard options; layout switching goes here.
|
|
|
|
|
'';
|
|
|
|
|
};
|
2009-01-25 15:49:08 +00:00
|
|
|
|
|
2011-12-30 23:26:11 +00:00
|
|
|
|
xkbVariant = mkOption {
|
2013-10-30 16:37:45 +00:00
|
|
|
|
type = types.str;
|
2011-12-30 23:26:11 +00:00
|
|
|
|
default = "";
|
|
|
|
|
example = "colemak";
|
|
|
|
|
description = ''
|
|
|
|
|
X keyboard variant.
|
|
|
|
|
'';
|
|
|
|
|
};
|
|
|
|
|
|
2009-09-10 13:37:33 +01:00
|
|
|
|
config = mkOption {
|
2013-10-30 16:37:45 +00:00
|
|
|
|
type = types.lines;
|
2009-09-10 13:37:33 +01:00
|
|
|
|
description = ''
|
|
|
|
|
The contents of the configuration file of the X server
|
|
|
|
|
(<filename>xorg.conf</filename>).
|
|
|
|
|
'';
|
|
|
|
|
};
|
2009-06-03 09:14:54 +01:00
|
|
|
|
|
2009-09-10 13:37:33 +01:00
|
|
|
|
deviceSection = mkOption {
|
2013-10-30 16:37:45 +00:00
|
|
|
|
type = types.lines;
|
2009-09-10 13:37:33 +01:00
|
|
|
|
default = "";
|
|
|
|
|
example = "VideoRAM 131072";
|
|
|
|
|
description = "Contents of the first Device section of the X server configuration file.";
|
|
|
|
|
};
|
2009-01-25 15:49:08 +00:00
|
|
|
|
|
2010-05-08 18:18:22 +01:00
|
|
|
|
screenSection = mkOption {
|
2013-10-30 16:37:45 +00:00
|
|
|
|
type = types.lines;
|
2010-05-08 18:18:22 +01:00
|
|
|
|
default = "";
|
|
|
|
|
example = ''
|
|
|
|
|
Option "RandRRotation" "on"
|
|
|
|
|
'';
|
|
|
|
|
description = "Contents of the first Screen section of the X server configuration file.";
|
|
|
|
|
};
|
|
|
|
|
|
2009-09-10 13:37:33 +01:00
|
|
|
|
monitorSection = mkOption {
|
2013-10-30 16:37:45 +00:00
|
|
|
|
type = types.lines;
|
2009-09-10 13:37:33 +01:00
|
|
|
|
default = "";
|
|
|
|
|
example = "HorizSync 28-49";
|
|
|
|
|
description = "Contents of the first Monitor section of the X server configuration file.";
|
|
|
|
|
};
|
2009-04-08 14:41:33 +01:00
|
|
|
|
|
2013-01-09 23:31:08 +00:00
|
|
|
|
xrandrHeads = mkOption {
|
|
|
|
|
default = [];
|
|
|
|
|
example = [ "HDMI-0" "DVI-0" ];
|
|
|
|
|
type = with types; listOf string;
|
|
|
|
|
description = ''
|
|
|
|
|
Simple multiple monitor configuration, just specify a list of XRandR
|
|
|
|
|
outputs which will be mapped from left to right in the order of the
|
|
|
|
|
list.
|
|
|
|
|
|
|
|
|
|
Be careful using this option with multiple graphic adapters or with
|
|
|
|
|
drivers that have poor support for XRandR, unexpected things might
|
|
|
|
|
happen with those.
|
|
|
|
|
'';
|
|
|
|
|
};
|
|
|
|
|
|
2013-11-04 14:45:05 +00:00
|
|
|
|
serverFlagsSection = mkOption {
|
|
|
|
|
default = "";
|
|
|
|
|
example =
|
|
|
|
|
''
|
|
|
|
|
Option "BlankTime" "0"
|
|
|
|
|
Option "StandbyTime" "0"
|
|
|
|
|
Option "SuspendTime" "0"
|
|
|
|
|
Option "OffTime" "0"
|
|
|
|
|
'';
|
|
|
|
|
description = "Contents of the ServerFlags section of the X server configuration file.";
|
|
|
|
|
};
|
|
|
|
|
|
2009-09-10 13:37:33 +01:00
|
|
|
|
moduleSection = mkOption {
|
2013-10-30 16:37:45 +00:00
|
|
|
|
type = types.lines;
|
2009-09-10 13:37:33 +01:00
|
|
|
|
default = "";
|
|
|
|
|
example =
|
|
|
|
|
''
|
|
|
|
|
SubSection "extmod"
|
|
|
|
|
EndSubsection
|
|
|
|
|
'';
|
|
|
|
|
description = "Contents of the Module section of the X server configuration file.";
|
|
|
|
|
};
|
2009-04-08 14:41:33 +01:00
|
|
|
|
|
2009-09-10 13:37:33 +01:00
|
|
|
|
serverLayoutSection = mkOption {
|
2013-10-30 16:37:45 +00:00
|
|
|
|
type = types.lines;
|
2009-09-10 13:37:33 +01:00
|
|
|
|
default = "";
|
|
|
|
|
example =
|
|
|
|
|
''
|
|
|
|
|
Option "AIGLX" "true"
|
|
|
|
|
'';
|
|
|
|
|
description = "Contents of the ServerLayout section of the X server configuration file.";
|
|
|
|
|
};
|
2009-01-25 15:49:08 +00:00
|
|
|
|
|
2009-09-10 13:37:33 +01:00
|
|
|
|
extraDisplaySettings = mkOption {
|
2013-10-30 16:37:45 +00:00
|
|
|
|
type = types.lines;
|
2009-09-10 13:37:33 +01:00
|
|
|
|
default = "";
|
|
|
|
|
example = "Virtual 2048 2048";
|
|
|
|
|
description = "Lines to be added to every Display subsection of the Screen section.";
|
|
|
|
|
};
|
2009-01-25 15:49:08 +00:00
|
|
|
|
|
2009-09-10 13:37:33 +01:00
|
|
|
|
defaultDepth = mkOption {
|
2013-10-30 16:37:45 +00:00
|
|
|
|
type = types.int;
|
2009-11-06 00:59:03 +00:00
|
|
|
|
default = 0;
|
2009-09-10 13:37:33 +01:00
|
|
|
|
example = 8;
|
|
|
|
|
description = "Default colour depth.";
|
|
|
|
|
};
|
2009-01-25 15:49:08 +00:00
|
|
|
|
|
2009-09-10 13:37:33 +01:00
|
|
|
|
useXFS = mkOption {
|
2013-10-30 16:37:45 +00:00
|
|
|
|
# FIXME: what's the type of this option?
|
2009-09-10 13:37:33 +01:00
|
|
|
|
default = false;
|
|
|
|
|
example = "unix/:7100";
|
|
|
|
|
description = "Determines how to connect to the X Font Server.";
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
tty = mkOption {
|
2013-10-30 16:37:45 +00:00
|
|
|
|
type = types.int;
|
2009-09-10 13:37:33 +01:00
|
|
|
|
default = 7;
|
|
|
|
|
description = "Virtual console for the X server.";
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
display = mkOption {
|
2013-10-30 16:37:45 +00:00
|
|
|
|
type = types.int;
|
2009-09-10 13:37:33 +01:00
|
|
|
|
default = 0;
|
|
|
|
|
description = "Display number for the X server.";
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
virtualScreen = mkOption {
|
2013-10-30 16:37:45 +00:00
|
|
|
|
type = types.nullOr types.attrs;
|
2009-09-10 13:37:33 +01:00
|
|
|
|
default = null;
|
|
|
|
|
example = { x = 2048; y = 2048; };
|
|
|
|
|
description = ''
|
|
|
|
|
Virtual screen size for Xrandr.
|
|
|
|
|
'';
|
|
|
|
|
};
|
2011-09-14 19:20:50 +01:00
|
|
|
|
|
2014-03-16 17:46:20 +00:00
|
|
|
|
useGlamor = mkOption {
|
|
|
|
|
type = types.bool;
|
|
|
|
|
default = false;
|
|
|
|
|
description = ''
|
|
|
|
|
Whether to use the Glamor module for 2D acceleration,
|
|
|
|
|
if possible.
|
|
|
|
|
'';
|
|
|
|
|
};
|
2009-09-10 13:37:33 +01:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
2013-05-16 16:23:31 +01:00
|
|
|
|
|
2009-09-10 13:37:33 +01:00
|
|
|
|
###### implementation
|
2009-11-21 22:14:01 +00:00
|
|
|
|
|
2013-10-30 17:30:23 +00:00
|
|
|
|
config = mkIf cfg.enable {
|
2014-04-29 13:16:34 +01:00
|
|
|
|
|
|
|
|
|
hardware.opengl.enable = mkDefault true;
|
|
|
|
|
|
2014-04-29 11:58:54 +01:00
|
|
|
|
services.xserver.videoDrivers = mkIf (cfg.videoDriver != null) [ cfg.videoDriver ];
|
2013-10-30 17:30:23 +00:00
|
|
|
|
|
2014-04-29 13:16:34 +01:00
|
|
|
|
# FIXME: somehow check for unknown driver names.
|
|
|
|
|
services.xserver.drivers = flip concatMap cfg.videoDrivers (name:
|
|
|
|
|
let driver =
|
|
|
|
|
attrByPath [name]
|
|
|
|
|
(if (hasAttr ("xf86video" + name) xorg)
|
|
|
|
|
then { modules = [(getAttr ("xf86video" + name) xorg) ]; }
|
|
|
|
|
else null)
|
|
|
|
|
knownVideoDrivers;
|
|
|
|
|
in optional (driver != null) ({ inherit name; driverName = name; } // driver));
|
|
|
|
|
|
2013-10-30 17:30:23 +00:00
|
|
|
|
assertions =
|
2014-04-17 23:45:26 +01:00
|
|
|
|
[ { assertion = !(config.programs.ssh.startAgent && cfg.startGnuPGAgent);
|
2013-10-30 17:30:23 +00:00
|
|
|
|
message =
|
|
|
|
|
''
|
2014-04-17 23:45:26 +01:00
|
|
|
|
The OpenSSH agent and GnuPG agent cannot be started both. Please
|
|
|
|
|
choose between ‘programs.ssh.startAgent’ and ‘services.xserver.startGnuPGAgent’.
|
2013-10-30 17:30:23 +00:00
|
|
|
|
'';
|
|
|
|
|
}
|
|
|
|
|
{ assertion = config.security.polkit.enable;
|
|
|
|
|
message = "X11 requires Polkit to be enabled (‘security.polkit.enable = true’).";
|
|
|
|
|
}
|
|
|
|
|
];
|
2009-09-10 13:37:33 +01:00
|
|
|
|
|
2012-10-07 16:24:42 +01:00
|
|
|
|
environment.etc =
|
2013-08-09 17:45:45 +01:00
|
|
|
|
(optionals cfg.exportConfiguration
|
|
|
|
|
[ { source = "${configFile}";
|
|
|
|
|
target = "X11/xorg.conf";
|
|
|
|
|
}
|
|
|
|
|
# -xkbdir command line option does not seems to be passed to xkbcomp.
|
|
|
|
|
{ source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
|
|
|
|
|
target = "X11/xkb";
|
|
|
|
|
}
|
2014-01-15 13:08:45 +00:00
|
|
|
|
]);
|
2011-09-14 19:20:50 +01:00
|
|
|
|
|
2013-10-30 16:52:35 +00:00
|
|
|
|
environment.systemPackages =
|
2009-09-10 13:37:33 +01:00
|
|
|
|
[ xorg.xorgserver
|
|
|
|
|
xorg.xrandr
|
|
|
|
|
xorg.xrdb
|
|
|
|
|
xorg.setxkbmap
|
|
|
|
|
xorg.iceauth # required for KDE applications (it's called by dcopserver)
|
2010-02-10 13:22:38 +00:00
|
|
|
|
xorg.xlsclients
|
|
|
|
|
xorg.xset
|
2009-09-10 13:37:33 +01:00
|
|
|
|
xorg.xsetroot
|
2013-04-27 02:30:40 +01:00
|
|
|
|
xorg.xinput
|
2009-09-13 14:26:35 +01:00
|
|
|
|
xorg.xprop
|
2010-02-10 13:22:38 +00:00
|
|
|
|
pkgs.xterm
|
2012-05-15 03:49:47 +01:00
|
|
|
|
pkgs.xdg_utils
|
2009-09-10 13:37:33 +01:00
|
|
|
|
]
|
2014-04-29 13:16:34 +01:00
|
|
|
|
++ optional (elem "virtualbox" cfg.videoDrivers) xorg.xrefresh
|
|
|
|
|
++ optional (elem "ati_unfree" cfg.videoDrivers) kernelPackages.ati_drivers_x11;
|
2014-03-17 18:27:06 +00:00
|
|
|
|
|
2010-08-09 19:04:55 +01:00
|
|
|
|
environment.pathsToLink =
|
|
|
|
|
[ "/etc/xdg" "/share/xdg" "/share/applications" "/share/icons" "/share/pixmaps" ];
|
2011-03-30 18:52:34 +01:00
|
|
|
|
|
2013-01-16 11:33:18 +00:00
|
|
|
|
systemd.defaultUnit = mkIf cfg.autorun "graphical.target";
|
2012-06-19 19:51:04 +01:00
|
|
|
|
|
2014-04-29 13:16:34 +01:00
|
|
|
|
systemd.services.display-manager =
|
2013-01-10 12:59:41 +00:00
|
|
|
|
{ description = "X11 Server";
|
|
|
|
|
|
2014-04-29 13:16:34 +01:00
|
|
|
|
after = [ "systemd-udev-settle.service" "local-fs.target" "acpid.service" ];
|
2011-09-14 19:20:50 +01:00
|
|
|
|
|
2012-08-17 18:14:42 +01:00
|
|
|
|
restartIfChanged = false;
|
2012-03-18 02:10:39 +00:00
|
|
|
|
|
|
|
|
|
environment =
|
2009-09-10 13:37:33 +01:00
|
|
|
|
{ FONTCONFIG_FILE = "/etc/fonts/fonts.conf"; # !!! cleanup
|
|
|
|
|
XKB_BINDIR = "${xorg.xkbcomp}/bin"; # Needed for the Xkb extension.
|
2013-05-16 16:23:31 +01:00
|
|
|
|
XORG_DRI_DRIVER_PATH = "/run/opengl-driver/lib/dri"; # !!! Depends on the driver selected at runtime.
|
2014-04-29 13:16:34 +01:00
|
|
|
|
LD_LIBRARY_PATH = concatStringsSep ":" (
|
|
|
|
|
[ "${xorg.libX11}/lib" "${xorg.libXext}/lib" ]
|
|
|
|
|
++ optionals (elem "ati_unfree" cfg.videoDrivers)
|
|
|
|
|
[ "${kernelPackages.ati_drivers_x11}/lib" "${kernelPackages.ati_drivers_x11}/X11R6/lib64/modules/linux" ]
|
|
|
|
|
++ concatLists (catAttrs "libPath" cfg.drivers));
|
2009-09-10 13:37:33 +01:00
|
|
|
|
} // cfg.displayManager.job.environment;
|
|
|
|
|
|
|
|
|
|
preStart =
|
|
|
|
|
''
|
2009-09-10 16:49:16 +01:00
|
|
|
|
${cfg.displayManager.job.preStart}
|
2009-09-10 13:37:33 +01:00
|
|
|
|
|
|
|
|
|
rm -f /tmp/.X0-lock
|
|
|
|
|
'';
|
|
|
|
|
|
2009-09-13 16:03:07 +01:00
|
|
|
|
script = "${cfg.displayManager.job.execCmd}";
|
2013-10-15 12:15:33 +01:00
|
|
|
|
|
|
|
|
|
serviceConfig = {
|
|
|
|
|
Restart = "always";
|
|
|
|
|
RestartSec = "200ms";
|
|
|
|
|
};
|
2009-09-10 13:37:33 +01:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
services.xserver.displayManager.xserverArgs =
|
|
|
|
|
[ "-ac"
|
|
|
|
|
"-logverbose"
|
|
|
|
|
"-verbose"
|
|
|
|
|
"-terminate"
|
|
|
|
|
"-logfile" "/var/log/X.${toString cfg.display}.log"
|
|
|
|
|
"-config ${configFile}"
|
|
|
|
|
":${toString cfg.display}" "vt${toString cfg.tty}"
|
|
|
|
|
"-xkbdir" "${pkgs.xkeyboard_config}/etc/X11/xkb"
|
|
|
|
|
] ++ optional (!cfg.enableTCP) "-nolisten tcp";
|
|
|
|
|
|
2009-11-06 00:59:03 +00:00
|
|
|
|
services.xserver.modules =
|
2014-04-29 13:16:34 +01:00
|
|
|
|
concatLists (catAttrs "modules" cfg.drivers) ++
|
2009-11-06 00:59:03 +00:00
|
|
|
|
[ xorg.xorgserver
|
|
|
|
|
xorg.xf86inputevdev
|
|
|
|
|
];
|
2011-09-14 19:20:50 +01:00
|
|
|
|
|
2009-09-10 13:37:33 +01:00
|
|
|
|
services.xserver.config =
|
|
|
|
|
''
|
|
|
|
|
Section "ServerFlags"
|
|
|
|
|
Option "AllowMouseOpenFail" "on"
|
2013-11-04 14:45:05 +00:00
|
|
|
|
${cfg.serverFlagsSection}
|
2009-09-10 13:37:33 +01:00
|
|
|
|
EndSection
|
|
|
|
|
|
|
|
|
|
Section "Module"
|
|
|
|
|
${cfg.moduleSection}
|
|
|
|
|
EndSection
|
|
|
|
|
|
|
|
|
|
Section "Monitor"
|
2009-11-06 00:59:03 +00:00
|
|
|
|
Identifier "Monitor[0]"
|
2009-09-10 13:37:33 +01:00
|
|
|
|
${cfg.monitorSection}
|
|
|
|
|
EndSection
|
|
|
|
|
|
2010-08-02 20:06:42 +01:00
|
|
|
|
Section "InputClass"
|
2010-08-10 15:13:57 +01:00
|
|
|
|
Identifier "Keyboard catchall"
|
2010-08-02 20:06:42 +01:00
|
|
|
|
MatchIsKeyboard "on"
|
|
|
|
|
Option "XkbRules" "base"
|
|
|
|
|
Option "XkbModel" "${cfg.xkbModel}"
|
|
|
|
|
Option "XkbLayout" "${cfg.layout}"
|
|
|
|
|
Option "XkbOptions" "${cfg.xkbOptions}"
|
2011-12-30 23:26:11 +00:00
|
|
|
|
Option "XkbVariant" "${cfg.xkbVariant}"
|
2010-08-02 20:06:42 +01:00
|
|
|
|
EndSection
|
|
|
|
|
|
2009-09-10 13:37:33 +01:00
|
|
|
|
Section "ServerLayout"
|
2009-11-06 00:59:03 +00:00
|
|
|
|
Identifier "Layout[all]"
|
2009-09-10 13:37:33 +01:00
|
|
|
|
${cfg.serverLayoutSection}
|
2009-11-06 00:59:03 +00:00
|
|
|
|
# Reference the Screen sections for each driver. This will
|
|
|
|
|
# cause the X server to try each in turn.
|
2014-04-29 13:16:34 +01:00
|
|
|
|
${flip concatMapStrings cfg.drivers (d: ''
|
2009-11-06 00:59:03 +00:00
|
|
|
|
Screen "Screen-${d.name}[0]"
|
|
|
|
|
'')}
|
2009-09-10 13:37:33 +01:00
|
|
|
|
EndSection
|
|
|
|
|
|
2014-03-16 17:46:20 +00:00
|
|
|
|
${if cfg.useGlamor then ''
|
|
|
|
|
Section "Module"
|
|
|
|
|
Load "dri2"
|
|
|
|
|
Load "glamoregl"
|
|
|
|
|
EndSection
|
|
|
|
|
'' else ""}
|
|
|
|
|
|
2009-11-06 00:59:03 +00:00
|
|
|
|
# For each supported driver, add a "Device" and "Screen"
|
|
|
|
|
# section.
|
2014-04-29 13:16:34 +01:00
|
|
|
|
${flip concatMapStrings cfg.drivers (driver: ''
|
2011-09-14 19:20:50 +01:00
|
|
|
|
|
2009-11-06 00:59:03 +00:00
|
|
|
|
Section "Device"
|
|
|
|
|
Identifier "Device-${driver.name}[0]"
|
2014-04-29 13:16:34 +01:00
|
|
|
|
Driver "${driver.driverName or driver.name}"
|
2014-03-16 17:46:20 +00:00
|
|
|
|
${if cfg.useGlamor then ''Option "AccelMethod" "glamor"'' else ""}
|
2009-11-06 00:59:03 +00:00
|
|
|
|
${cfg.deviceSection}
|
2013-01-09 23:31:08 +00:00
|
|
|
|
${xrandrDeviceSection}
|
2009-11-06 00:59:03 +00:00
|
|
|
|
EndSection
|
|
|
|
|
|
|
|
|
|
Section "Screen"
|
|
|
|
|
Identifier "Screen-${driver.name}[0]"
|
|
|
|
|
Device "Device-${driver.name}[0]"
|
2010-08-09 21:10:16 +01:00
|
|
|
|
${optionalString (cfg.monitorSection != "") ''
|
|
|
|
|
Monitor "Monitor[0]"
|
|
|
|
|
''}
|
2009-11-06 00:59:03 +00:00
|
|
|
|
|
2010-05-08 18:18:22 +01:00
|
|
|
|
${cfg.screenSection}
|
|
|
|
|
|
2009-11-06 00:59:03 +00:00
|
|
|
|
${optionalString (cfg.defaultDepth != 0) ''
|
|
|
|
|
DefaultDepth ${toString cfg.defaultDepth}
|
|
|
|
|
''}
|
|
|
|
|
|
|
|
|
|
${optionalString
|
2010-08-09 21:10:16 +01:00
|
|
|
|
(driver.name != "virtualbox" &&
|
|
|
|
|
(cfg.resolutions != [] ||
|
|
|
|
|
cfg.extraDisplaySettings != "" ||
|
|
|
|
|
cfg.virtualScreen != null))
|
|
|
|
|
(let
|
2009-11-06 00:59:03 +00:00
|
|
|
|
f = depth:
|
|
|
|
|
''
|
|
|
|
|
SubSection "Display"
|
|
|
|
|
Depth ${toString depth}
|
|
|
|
|
${optionalString (cfg.resolutions != [])
|
|
|
|
|
"Modes ${concatMapStrings (res: ''"${toString res.x}x${toString res.y}"'') cfg.resolutions}"}
|
|
|
|
|
${cfg.extraDisplaySettings}
|
|
|
|
|
${optionalString (cfg.virtualScreen != null)
|
|
|
|
|
"Virtual ${toString cfg.virtualScreen.x} ${toString cfg.virtualScreen.y}"}
|
|
|
|
|
EndSubSection
|
|
|
|
|
'';
|
|
|
|
|
in concatMapStrings f [8 16 24]
|
|
|
|
|
)}
|
2011-09-14 19:20:50 +01:00
|
|
|
|
|
2009-11-06 00:59:03 +00:00
|
|
|
|
EndSection
|
|
|
|
|
'')}
|
2013-01-09 21:19:58 +00:00
|
|
|
|
|
2013-01-09 23:31:08 +00:00
|
|
|
|
${xrandrMonitorSections}
|
2009-09-10 13:37:33 +01:00
|
|
|
|
'';
|
|
|
|
|
|
2013-10-30 17:30:23 +00:00
|
|
|
|
};
|
2009-09-10 13:37:33 +01:00
|
|
|
|
|
2006-11-28 22:27:56 +00:00
|
|
|
|
}
|
2013-05-16 16:23:31 +01:00
|
|
|
|
|