2
0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-28 00:24:18 +00:00
Commit Graph

117 Commits

Author SHA1 Message Date
Nicolas Pierron
c9dc3651da Replace mkOverride by its alias mkOverrideTemplate to remove the unused
template argument of mkOverride later.

svn path=/nixos/trunk/; revision=23631
2010-09-03 19:10:59 +00:00
Nicolas Pierron
6fa66ff7b9 Move matches just below the identifier.
svn path=/nixos/trunk/; revision=23628
2010-09-03 19:10:45 +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
Yury G. Kudryashov
a7d7f1630f Will move digikam outside of kde4 in kde4.5, so change example
svn path=/nixos/trunk/; revision=23266
2010-08-19 23:07:14 +00:00
Eelco Dolstra
751ec4f845 * Xfce requires desktop-file-utils to create/update .desktop files.
svn path=/nixos/trunk/; revision=23183
2010-08-16 07:48: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
8de6ab7dff * Enable the Xfce power manager.
svn path=/nixos/trunk/; revision=23079
2010-08-09 23:15:39 +00:00
Eelco Dolstra
c388446bb0 * Xfce is now more or less functional.
svn path=/nixos/trunk/; revision=23075
2010-08-09 21:59:34 +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
Eelco Dolstra
f6497fa576 * Use the proper Xfce session start script. Include the desktop and
the panel.

svn path=/nixos/trunk/; revision=23055
2010-08-09 11:51:44 +00:00
Eelco Dolstra
fc8204c0e4 * Always symlink etc/dbus-1 and share/dbus-1 in the system path, not
just when KDE is enabled.

svn path=/nixos/trunk/; revision=23053
2010-08-09 11:42:32 +00:00
Eelco Dolstra
5041cdddbd * Start of an Xfce desktop manager module. Currently it just starts
Xfwm and Terminal.

svn path=/nixos/trunk/; revision=23048
2010-08-08 22:45:54 +00:00
Eelco Dolstra
6e118cd66b * Change the default desktop manager from "xterm" to the last imported
and enabled desktop manager (e.g. "kde" if KDE is enabled, and
  "xterm" if nothing is explicitly enabled).  This means that you
  don't have to write

    services.xserver.desktopManager.default = "kde4";

  anymore in addition to

    services.xserver.desktopManager.kde4.enable = true;

  to make KDE the default desktop environment.
  
* Remove the "none + none" session type.

* Remove the "+ none" string at the end of session types.  I.e. now
  it's "kde", not "kde + none".

* In kdm, add coreutils to its SystemPath so that it can remove the
  temporary directories in /tmp that it creates.

svn path=/nixos/trunk/; revision=23036
2010-08-08 14:05:32 +00:00
Eelco Dolstra
622a7d3d46 * If kdm is enabled, disabled slim automatically. This is so that
users don't have to write

    services.xserver.displayManager.kdm.enable = true;
    services.xserver.displayManager.slim.enable = false;

  to enable kdm, but just

    services.xserver.displayManager.kdm.enable = true;


svn path=/nixos/trunk/; revision=23033
2010-08-08 12:39:00 +00:00
Michael Raskin
3cab6d3e1c Fixing extra /bin/sh in the shell - noticed by Eelco Dolstra
svn path=/nixos/trunk/; revision=23021
2010-08-07 11:16:06 +00:00
Michael Raskin
dec8079468 Fix stdenv reference
svn path=/nixos/trunk/; revision=23020
2010-08-07 10:26:37 +00:00
Michael Raskin
255a56fbc5 allow wildcard Synaptics configuration
svn path=/nixos/trunk/; revision=22954
2010-08-04 20:07:58 +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
da0d5c5645 * Use config.system.build.grub rather than pkgs.grub to get the right
GRUB when version 2 is enabled.

svn path=/nixos/branches/boot-order/; revision=22479
2010-07-05 14:33:11 +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
95a9c5dd77 * Log the standard output/error of Upstart jobs to
/var/log/upstart/<jobname> rather than spamming the console with it.

svn path=/nixos/trunk/; revision=22093
2010-06-01 19:44:23 +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
Yury G. Kudryashov
32d41f439d Remove KDE3 desktop
We have no full KDE3 desktop anyway. KDE3 desktop was broken for a while, and nobody noticed.

svn path=/nixos/trunk/; revision=21996
2010-05-27 09:35:36 +00:00
Yury G. Kudryashov
2dfd9b51ae gnupg2 is now called gnupg
svn path=/nixos/trunk/; revision=21889
2010-05-19 21:11:46 +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
Yury G. Kudryashov
7ae39feedb Get rid of extraSetuidPrograms.
Also state in description that it is obsolete.

svn path=/nixos/trunk/; revision=21777
2010-05-14 21:01:06 +00:00
Lluís Batlle i Rossell
825923a051 Adding the 'awesome' window manager to nixos.
I made the system sw path include /etc/xdg - awesome looks for some file
in the XDG_CONFIG_DIRS, which in bashrc is set to point to the profiles/etc/xdg


svn path=/nixos/trunk/; revision=21675
2010-05-08 23:24:00 +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
Lluís Batlle i Rossell
b690751956 Fixing the kwm nixos module - the kde3 attribute path changed in nixpkgs.
svn path=/nixos/trunk/; revision=21549
2010-05-01 20:25:57 +00:00
Yury G. Kudryashov
0829b8ea8c Link /etc/{xdg,dbus-1} if KDE is enabled
svn path=/nixos/trunk/; revision=21449
2010-04-30 07:36:24 +00:00
Yury G. Kudryashov
ce15e270f2 Fix non-bc change
svn path=/nixos/trunk/; revision=21326
2010-04-26 15:57:06 +00:00
Yury G. Kudryashov
8e8554242f Remove extraLinkPaths, thanks to Pierron for explanation
Now pathsToLink=["/include"] in configuration.nix will add /include instead of overwriting.

svn path=/nixos/trunk/; revision=21111
2010-04-16 05:09:10 +00:00
Yury G. Kudryashov
267e0af8db A few typos in previous commits
svn path=/nixos/trunk/; revision=21105
2010-04-15 17:02:33 +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
8324ccf755 Add /var/run/current-system/sw to NIX_PROFILES
Also adds a possibility to just add KDE packages to systemPackages.

svn path=/nixos/trunk/; revision=21103
2010-04-15 15:47:15 +00:00
Yury G. Kudryashov
4d39d70406 Start ssh-agent or gpg-agent even if called by kdm
svn path=/nixos/trunk/; revision=21100
2010-04-15 15:46:47 +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
Sander van der Burg
3d87a133a0 Added gstreamer plugins to the systemPackages, so that Phonon does not crash on shutdown when using KDE 4.4.x
svn path=/nixos/trunk/; revision=20350
2010-03-03 13:22: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
73668f41da * Added an "auto" pseudo display manager that logs in a user
automatically.  This is mostly useful for testing.  (KDM also has
  this feature, but it's nice not to depend on KDE for non-KDE tests.)

svn path=/nixos/trunk/; revision=19239
2010-01-05 15:32:14 +00:00
Eelco Dolstra
62476f2816 * Added a module for IceWM.
svn path=/nixos/trunk/; revision=19238
2010-01-05 15:30:56 +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