Eelco Dolstra
b1da38f564
Merge remote-tracking branch 'origin/master' into systemd
2012-11-30 16:12:04 +01:00
Marc Weber
87bb6b1c6d
making ati proprietary drivers work again
...
However SLIM is still broken and you have to create a
/usr/lib/dri/fglrx_dri.so symlink pointing to
/run/opengl-driver/lib/fglrx_dri.so
At least fgl_glxgears shows 10 times more frames per second now
2012-10-07 17:24:42 +02:00
Eelco Dolstra
b02c488fde
Automatically append ".service" to the name of service units
2012-08-23 10:25:27 -04:00
Eelco Dolstra
c60d6caee8
Rename xserver.service to display-manager.service
...
The latter is what graphical.target expects.
2012-08-17 14:43:41 -04:00
Eelco Dolstra
a44e575196
switch-to-configuration: Respect the ‘restartIfChanged’ attribute
2012-08-17 13:14:42 -04:00
Eelco Dolstra
44d091674b
Merge branch 'master' of github.com:NixOS/nixos into systemd
...
Conflicts:
modules/config/networking.nix
modules/services/networking/ssh/sshd.nix
modules/services/ttys/agetty.nix
modules/system/boot/stage-2-init.sh
modules/system/upstart-events/shutdown.nix
2012-07-16 17:27:11 -04:00
Eelco Dolstra
1d57489427
Global replace /var/run/opengl-driver -> /run/opengl-driver
2012-07-16 11:34:21 -04:00
Eelco Dolstra
dab6bbe3a6
Set the default unit to "graphical.target" if X11 is enabled
2012-06-19 14:51:04 -04:00
Eelco Dolstra
ea3cfc9287
* Add xdg-open to the default X11 configuration so that programs like
...
Chrome can open downloaded files.
svn path=/nixos/trunk/; revision=34097
2012-05-15 02:49:47 +00:00
Shea Levy
11066067f7
Add nouveau xorg video driver
...
svn path=/nixos/trunk/; revision=33300
2012-03-20 16:29:22 +00:00
Shea Levy
14dd95b692
xserver.nix: Automatically support xorg's own video drivers
...
svn path=/nixos/trunk/; revision=33281
2012-03-19 23:57:26 +00:00
Eelco Dolstra
86d8d62d16
* Allow Upstart jobs to declare that they shouldn't be restarted by
...
switch-to-configuration. E.g. the X server shouldn't be restarted
because that kills all the X clients.
svn path=/nixos/trunk/; revision=33223
2012-03-18 02:10:39 +00:00
Eelco Dolstra
ed436179e1
* Improve some job names.
...
svn path=/nixos/trunk/; revision=33215
2012-03-17 19:22:22 +00:00
Eelco Dolstra
1186167be2
* Fix xserver restart with cfg.driSupport32Bit. Contributed by Kirill
...
Elagin.
svn path=/nixos/trunk/; revision=33099
2012-03-15 10:26:08 +00:00
Florian Friesdorf
76986a24f9
enable noX11 on kernel cmdline to suppress start of X
...
xserver is started on start_xserver event, which is emitted by
check_for_xserver_start if there is no "noX11" on the kernel cmdline.
Thanks to viric for the general idea.
svn path=/nixos/trunk/; revision=31166
2011-12-31 00:24:48 +00:00
Florian Friesdorf
5b7e7bb429
services.xserver.xkbVariant
...
svn path=/nixos/trunk/; revision=31165
2011-12-30 23:26:11 +00:00
Peter Simons
eb6e1310b8
strip trailing whitespace; no functional change
...
svn path=/nixos/trunk/; revision=29285
2011-09-14 18:20:50 +00:00
Eelco Dolstra
38fddb2243
* The X server doesn't actually depend on HAL anymore.
...
svn path=/nixos/trunk/; revision=27932
2011-07-25 00:50:46 +00:00
Nicolas Pierron
96fc9379ba
Convert assertion option into mkAssert.
...
svn path=/nixos/trunk/; revision=26614
2011-03-30 17:52:34 +00:00
Lluís Batlle i Rossell
63c3d72aa6
Updating the nvidiaLegacy nixos xserver driver to a numbered name, to match the current
...
*two* possibilities of nvidia legacy driver in nixpkgs.
svn path=/nixos/trunk/; revision=23412
2010-08-24 22:00:18 +00:00
Lluís Batlle i Rossell
1e7058d025
Removing the NvAGP special option for nvidiaLegacy. Although it helped in
...
suspending the machine, it also slowed down the graphics (specially 2D) quite a lot.
firefox flash, firefox scrolling was a pain.
I'll leave that up to the nixos user with the cfg.deviceSection.
svn path=/nixos/trunk/; revision=23407
2010-08-24 18:24:06 +00:00
Eelco Dolstra
2e0a569187
* Use InputClass in the synaptics module to automatically use the
...
synaptics driver for all touchpads (unless the "dev" option is set).
* Get rid of some synaptics options: SHMConfig, Repeater (obsolete);
*Edge (usually auto-detected), Protocol (use auto-detect instead).
svn path=/nixos/trunk/; revision=23092
2010-08-10 14:13:57 +00:00
Eelco Dolstra
5456815016
* Re-enable ctrl-alt-backspace to kill the X server.
...
svn path=/nixos/trunk/; revision=23089
2010-08-10 12:37:39 +00:00
Eelco Dolstra
31db968be4
* In QEMU, set a higher refresh rate in xorg.conf so that resolutions
...
higher than 800x600 work.
* Add a "Monitor" statement to the "Screen" section, because otherwise
the Monitor section is ignored.
svn path=/nixos/trunk/; revision=23068
2010-08-09 20:10:16 +00:00
Eelco Dolstra
057602f3f2
* Some subdirectories should always be symlinked in the system path
...
when X11 is enabled (e.g. etc/xdg, share/icons...).
svn path=/nixos/trunk/; revision=23062
2010-08-09 18:04:55 +00:00
Lluís Batlle i Rossell
02bf0db39e
Making the X keyboard settings go in xorg.conf, and not in HAL anymore.
...
Setting to the synaptics default speeds the speeds I like. I think we were having
defaults still from the time the values meant some different speeds.
The 'synclient' program now does not work, but the 'xinput' program (xorg.xinput)
can modify in runtime the touchpad settings too.
svn path=/nixos/trunk/; revision=22904
2010-08-02 19:06:42 +00:00
Eelco Dolstra
c52cbca24d
* Set $TZ in the X server job (mostly so that the kdm clock shows the
...
right time).
svn path=/nixos/trunk/; revision=22728
2010-07-25 09:52:20 +00:00
Eelco Dolstra
48fdc931a4
* Run udevtrigger in a separate job. This speeds up booting because
...
it allows the `mountall' task to start mounting filesystems as soon
as udev is running and devices become available (i.e. it doesn't
have to wait for all devices). This means that some jobs should
depend on "stopped udevtrigger" instead of "started udev".
svn path=/nixos/branches/boot-order/; revision=22167
2010-06-07 12:39:50 +00:00
Eelco Dolstra
eb4c33eeca
* Added an option to enable support for 32-bit binaries (such as Wine
...
or Google Earth) on 64-bit NixOS on NVIDIA hardware. The 32-bit
OpenGL library is symlinked from /var/run/opengl-driver-32, which is
added to the LD_LIBRARY_PATH so that 32-bit binaries can find it.
svn path=/nixos/trunk/; revision=22062
2010-05-30 22:00:52 +00:00
Marc Weber
674d396576
adding initial support for proprietary ati drivers You have to add some impure paths, see: http://thread.gmane.org/gmane.linux.distributions.nixos/4145
...
svn path=/nixos/trunk/; revision=21847
2010-05-18 19:36:11 +00:00
Nicolas Pierron
1ba1b66efd
Add services.xserver.screenSection to add additional screen options.
...
svn path=/nixos/trunk/; revision=21662
2010-05-08 17:18:22 +00:00
Yury G. Kudryashov
1e83fe6122
Remove tabs
...
svn path=/nixos/trunk/; revision=21104
2010-04-15 15:47:26 +00:00
Yury G. Kudryashov
916fbfa070
Add xf86-linux-wacom.
...
Mostly reverts my previous commit.
svn path=/nixos/trunk/; revision=21099
2010-04-15 15:46:38 +00:00
Yury G. Kudryashov
9cce36182d
Remove linuxwacom: it is not compatible with new xserver
...
svn path=/nixos/trunk/; revision=21015
2010-04-11 20:41:06 +00:00
Ludovic Courtès
b7b1f5d1cc
X11: Add a few more basic X clients to `systemPackages'.
...
svn path=/nixos/trunk/; revision=19902
2010-02-10 13:22:38 +00:00
Eelco Dolstra
a21f18e81f
* Synced with the trunk.
...
svn path=/nixos/branches/upstart-0.6/; revision=18602
2009-11-24 16:11:01 +00:00
Michael Raskin
69a2842d01
Switch off one of the two conflicting on-by-default options
...
svn path=/nixos/trunk/; revision=18519
2009-11-22 14:34:53 +00:00
Ludovic Courtès
1966f9d297
Hopefully really fix the OpenSSH/GnuPG agent assertion (yes!).
...
svn path=/nixos/trunk/; revision=18517
2009-11-22 00:54:01 +00:00
Ludovic Courtès
d912b510f5
Hopefully really fix the OpenSSH/GnuPG agent assertion.
...
svn path=/nixos/trunk/; revision=18516
2009-11-22 00:46:37 +00:00
Ludovic Courtès
ab3332a2eb
Rename startSSHAgent' to
startOpenSSHAgent'.
...
svn path=/nixos/trunk/; revision=18515
2009-11-22 00:40:53 +00:00
Ludovic Courtès
8c349a9e71
Fix the OpenSSH/GnuPG agent assertion.
...
svn path=/nixos/trunk/; revision=18514
2009-11-22 00:40:48 +00:00
Ludovic Courtès
66d8af6d09
X: Add support for starting the GnuPG agent.
...
svn path=/nixos/trunk/; revision=18509
2009-11-21 22:14:01 +00:00
Eelco Dolstra
aa9d0a067e
* Sync with the trunk.
...
svn path=/nixos/branches/upstart-0.6/; revision=18408
2009-11-18 11:50:06 +00:00
Eelco Dolstra
56d817b0b0
* X server: remove the udev hack.
...
svn path=/nixos/branches/upstart-0.6/; revision=18358
2009-11-15 20:38:19 +00:00
Sander van der Burg
4af37a0994
VirtualBox Xorg driver needs xrefresh, so added it to the environment when using the virtualbox driver
...
svn path=/nixos/trunk/; revision=18322
2009-11-10 15:25:50 +00:00
Eelco Dolstra
d1bbe706a2
* Synced with the trunk.
...
svn path=/nixos/branches/upstart-0.6/; revision=18297
2009-11-08 21:27:53 +00:00
Nicolas Pierron
616c844336
* Move the default value of videoDrivers into the default field of the
...
option. Otherwise, the system may depends on unused/unsupported
softwares and users will be force to use properties in their
configuration.nix file to override this default value. (too complex for
new users)
svn path=/nixos/trunk/; revision=18288
2009-11-08 16:01:22 +00:00
Eelco Dolstra
83a9bf9a6a
* Change all the startOn / stopOn attributes to the Upstart 0.6 syntax
...
(e.g., startOn = "started foo" instead of startOn = "foo").
svn path=/nixos/branches/upstart-0.6/; revision=18230
2009-11-06 22:19:17 +00:00
Eelco Dolstra
c0f732f079
* Work around a lack of laziness in the xserver.nix module.
...
svn path=/nixos/trunk/; revision=18216
2009-11-06 16:30:48 +00:00
Eelco Dolstra
124096e418
* Remember the original symbolic driver name.
...
svn path=/nixos/trunk/; revision=18185
2009-11-06 09:22:00 +00:00