MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-15 22:36:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
nixpkgs/upstart-jobs/xserver.conf

107 lines
1.8 KiB
Text
Raw Normal View History

* Add the X server as an Upstart service. The X server is pure, except for the fonts, which are still hardcoded. The current configuration uses the VESA driver, which should work on most machines. Of course, the configuration should now be generated from a higher-level specification. svn path=/nixos/trunk/; revision=7165
2006-11-28 23:27:56 +01:00
Section "Files"
* Construct the module path dynamically. svn path=/nixos/trunk/; revision=8059
2007-02-26 22:39:07 +01:00
# Font directories.
* Pure X server. All fonts are now in the Nix store. svn path=/nixos/trunk/; revision=8041
2007-02-25 16:53:57 +01:00
@fontPaths@
* Construct the module path dynamically. svn path=/nixos/trunk/; revision=8059
2007-02-26 22:39:07 +01:00
# Module (driver) directories.
@modulePaths@
* Add the X server as an Upstart service. The X server is pure, except for the fonts, which are still hardcoded. The current configuration uses the VESA driver, which should work on most machines. Of course, the configuration should now be generated from a higher-level specification. svn path=/nixos/trunk/; revision=7165
2006-11-28 23:27:56 +01:00
EndSection
Section "ServerFlags"
* Use xinit to start the X server plus some initial clients (twm + xterm). svn path=/nixos/trunk/; revision=8043
2007-02-25 17:20:14 +01:00
Option "AllowMouseOpenFail" "on"
* Add the X server as an Upstart service. The X server is pure, except for the fonts, which are still hardcoded. The current configuration uses the VESA driver, which should work on most machines. Of course, the configuration should now be generated from a higher-level specification. svn path=/nixos/trunk/; revision=7165
2006-11-28 23:27:56 +01:00
EndSection
Section "Module"
nixos dir: Xserver and samba nixos svn path=/nixos/trunk/; revision=8784
2007-05-28 16:09:04 +02:00
Load "bitmap"
* Re-enable some essential X server modules (in particular extmod, which contains XVideo). svn path=/nixos/trunk/; revision=8857
2007-06-09 23:12:48 +02:00
Load "dbe"
Load "extmod"
nixos dir: Xserver and samba nixos svn path=/nixos/trunk/; revision=8784
2007-05-28 16:09:04 +02:00
Load "freetype"
Load "int10"
* Re-enable some essential X server modules (in particular extmod, which contains XVideo). svn path=/nixos/trunk/; revision=8857
2007-06-09 23:12:48 +02:00
Load "type1"
nixos dir: Xserver and samba nixos svn path=/nixos/trunk/; revision=8784
2007-05-28 16:09:04 +02:00
Load "vbe"
@moduleSection@
Added some options for manual text insertion into xorg.conf . Removed (commented out) MonitorLayout by default. It was the thing that prevents i915GM on laptops from working. Those who need it can add it back in extraDeviceOptions. svn path=/nixos/trunk/; revision=9527
2007-10-26 06:28:01 +02:00
@extraModules@
* Add the X server as an Upstart service. The X server is pure, except for the fonts, which are still hardcoded. The current configuration uses the VESA driver, which should work on most machines. Of course, the configuration should now be generated from a higher-level specification. svn path=/nixos/trunk/; revision=7165
2006-11-28 23:27:56 +01:00
EndSection
Section "InputDevice"
Driver "kbd"
Identifier "Keyboard[0]"
Option "Protocol" "Standard"
Added language switch support to xserver.nix svn path=/nixos/trunk/; revision=9367
2007-09-24 11:19:34 +02:00
Option "XkbLayout" "@layout@"
* Add the X server as an Upstart service. The X server is pure, except for the fonts, which are still hardcoded. The current configuration uses the VESA driver, which should work on most machines. Of course, the configuration should now be generated from a higher-level specification. svn path=/nixos/trunk/; revision=7165
2006-11-28 23:27:56 +01:00
Option "XkbModel" "pc104"
Option "XkbRules" "xfree86"
Added language switch support to xserver.nix svn path=/nixos/trunk/; revision=9367
2007-09-24 11:19:34 +02:00
@xkbOptions@
* Add the X server as an Upstart service. The X server is pure, except for the fonts, which are still hardcoded. The current configuration uses the VESA driver, which should work on most machines. Of course, the configuration should now be generated from a higher-level specification. svn path=/nixos/trunk/; revision=7165
2006-11-28 23:27:56 +01:00
EndSection
Section "InputDevice"
Driver "mouse"
Identifier "Mouse[0]"
* Use xinit to start the X server plus some initial clients (twm + xterm). svn path=/nixos/trunk/; revision=8043
2007-02-25 17:20:14 +01:00
Option "Device" "/dev/input/mice"
* Add the X server as an Upstart service. The X server is pure, except for the fonts, which are still hardcoded. The current configuration uses the VESA driver, which should work on most machines. Of course, the configuration should now be generated from a higher-level specification. svn path=/nixos/trunk/; revision=7165
2006-11-28 23:27:56 +01:00
EndSection
Added synaptics support to xserver upstart-job. svn path=/nixos/trunk/; revision=9366
2007-09-24 11:02:43 +02:00
@synapticsInputDevice@
* Add the X server as an Upstart service. The X server is pure, except for the fonts, which are still hardcoded. The current configuration uses the VESA driver, which should work on most machines. Of course, the configuration should now be generated from a higher-level specification. svn path=/nixos/trunk/; revision=7165
2006-11-28 23:27:56 +01:00
Section "Monitor"
Identifier "Monitor[0]"
Option "DPMS"
* Use the new Intel driver. svn path=/nixos/trunk/; revision=8633
2007-05-01 17:27:50 +02:00
# HorizSync 28-49
# VertRefresh 43-75
Added some options for manual text insertion into xorg.conf . Removed (commented out) MonitorLayout by default. It was the thing that prevents i915GM on laptops from working. Those who need it can add it back in extraDeviceOptions. svn path=/nixos/trunk/; revision=9527
2007-10-26 06:28:01 +02:00
@extraMonitorSettings@
* Add the X server as an Upstart service. The X server is pure, except for the fonts, which are still hardcoded. The current configuration uses the VESA driver, which should work on most machines. Of course, the configuration should now be generated from a higher-level specification. svn path=/nixos/trunk/; revision=7165
2006-11-28 23:27:56 +01:00
EndSection
Section "Screen"
Identifier "Screen[0]"
Device "Device[0]"
Monitor "Monitor[0]"
Added some options for manual text insertion into xorg.conf . Removed (commented out) MonitorLayout by default. It was the thing that prevents i915GM on laptops from working. Those who need it can add it back in extraDeviceOptions. svn path=/nixos/trunk/; revision=9527
2007-10-26 06:28:01 +02:00
DefaultDepth @defaultDepth@
* Add the X server as an Upstart service. The X server is pure, except for the fonts, which are still hardcoded. The current configuration uses the VESA driver, which should work on most machines. Of course, the configuration should now be generated from a higher-level specification. svn path=/nixos/trunk/; revision=7165
2006-11-28 23:27:56 +01:00
SubSection "Display"
Depth 16
* Specify the resolution and the video driver name in the configuration file. svn path=/nixos/trunk/; revision=8061
2007-02-27 00:11:32 +01:00
Modes @resolutions@
* Add the X server as an Upstart service. The X server is pure, except for the fonts, which are still hardcoded. The current configuration uses the VESA driver, which should work on most machines. Of course, the configuration should now be generated from a higher-level specification. svn path=/nixos/trunk/; revision=7165
2006-11-28 23:27:56 +01:00
EndSubSection
* Enable compositing in the X server. svn path=/nixos/trunk/; revision=8118
2007-02-28 23:59:39 +01:00
SubSection "Display"
Depth 24
Modes @resolutions@
EndSubSection
nixos dir: Xserver and samba nixos svn path=/nixos/trunk/; revision=8784
2007-05-28 16:09:04 +02:00
#SubSection "Display"
# Depth 32
# Modes @resolutions@
#EndSubSection
@screen@
* Add the X server as an Upstart service. The X server is pure, except for the fonts, which are still hardcoded. The current configuration uses the VESA driver, which should work on most machines. Of course, the configuration should now be generated from a higher-level specification. svn path=/nixos/trunk/; revision=7165
2006-11-28 23:27:56 +01:00
EndSection
Section "Device"
Identifier "Device[0]"
* Specify the resolution and the video driver name in the configuration file. svn path=/nixos/trunk/; revision=8061
2007-02-27 00:11:32 +01:00
Driver "@videoDriver@"
Changed X server upstart expression a bit, now works for my Intel 915GM notebook (with vesa at least). svn path=/nixos/trunk/; revision=9364
2007-09-24 07:16:15 +02:00
Option "Clone" "@isClone@"
* Re-enable some essential X server modules (in particular extmod, which contains XVideo). svn path=/nixos/trunk/; revision=8857
2007-06-09 23:12:48 +02:00
#Option "MonitorLayout" "CRT,LFP"
Added some options for manual text insertion into xorg.conf . Removed (commented out) MonitorLayout by default. It was the thing that prevents i915GM on laptops from working. Those who need it can add it back in extraDeviceOptions. svn path=/nixos/trunk/; revision=9527
2007-10-26 06:28:01 +02:00
#Option "MonitorLayout" "LVDS,CRT"
nixos dir: Xserver and samba nixos svn path=/nixos/trunk/; revision=8784
2007-05-28 16:09:04 +02:00
@device@
Added keyboard layout to options and internal AGPGART option svn path=/nixos/trunk/; revision=9369
2007-09-24 21:32:21 +02:00
@internalAGPGART@
Added some options for manual text insertion into xorg.conf . Removed (commented out) MonitorLayout by default. It was the thing that prevents i915GM on laptops from working. Those who need it can add it back in extraDeviceOptions. svn path=/nixos/trunk/; revision=9527
2007-10-26 06:28:01 +02:00
@extraDeviceConfig@
* Add the X server as an Upstart service. The X server is pure, except for the fonts, which are still hardcoded. The current configuration uses the VESA driver, which should work on most machines. Of course, the configuration should now be generated from a higher-level specification. svn path=/nixos/trunk/; revision=7165
2006-11-28 23:27:56 +01:00
EndSection
Section "ServerLayout"
Identifier "Layout[all]"
InputDevice "Keyboard[0]" "CoreKeyboard"
Added synaptics support to xserver upstart-job. svn path=/nixos/trunk/; revision=9366
2007-09-24 11:02:43 +02:00
InputDevice "@corePointer@" "CorePointer"
* Add the X server as an Upstart service. The X server is pure, except for the fonts, which are still hardcoded. The current configuration uses the VESA driver, which should work on most machines. Of course, the configuration should now be generated from a higher-level specification. svn path=/nixos/trunk/; revision=7165
2006-11-28 23:27:56 +01:00
Screen "Screen[0]"
Added some options for manual text insertion into xorg.conf . Removed (commented out) MonitorLayout by default. It was the thing that prevents i915GM on laptops from working. Those who need it can add it back in extraDeviceOptions. svn path=/nixos/trunk/; revision=9527
2007-10-26 06:28:01 +02:00
@serverLayoutOptions@
* Add the X server as an Upstart service. The X server is pure, except for the fonts, which are still hardcoded. The current configuration uses the VESA driver, which should work on most machines. Of course, the configuration should now be generated from a higher-level specification. svn path=/nixos/trunk/; revision=7165
2006-11-28 23:27:56 +01:00
EndSection
* Enable compositing in the X server. svn path=/nixos/trunk/; revision=8118
2007-02-28 23:59:39 +01:00
Section "Extensions"
nixos dir: Xserver and samba nixos svn path=/nixos/trunk/; revision=8784
2007-05-28 16:09:04 +02:00
@extensions@
* Enable compositing in the X server. svn path=/nixos/trunk/; revision=8118
2007-02-28 23:59:39 +01:00
EndSection
* X session script: - Set the desktop background to the image ~/.background-image. - Depending on services.xserver.sessionType, start an xterm or a gnome-terminal as the "desktop" :-) * Upstart jobs can now declare extra packages to be added to the system path through the `extraPath' attribute. For instance, the ALSA job adds alsa-utils, and the X server job adds lots of stuff depending on the X configuration (e.g., xrandr, gnome-terminal, twm). * Create a cdrom/dvd symlink for SCSI sr? devices. svn path=/nixos/trunk/; revision=8221
2007-03-06 01:07:00 +01:00
Section "DRI"
Mode 0666 # !!! FIX THIS!
EndSection
nixos dir: Xserver and samba nixos svn path=/nixos/trunk/; revision=8784
2007-05-28 16:09:04 +02:00
Reference in a new issue Copy permalink