Peter Simons
eb6e1310b8
strip trailing whitespace; no functional change
...
svn path=/nixos/trunk/; revision=29285
2011-09-14 18:20:50 +00:00
Peter Simons
f5e8d35f8e
modules/services/printing/cupsd.nix: /etc/cups/mime.{convs,types} are obsolete
...
Current versions of CUPS (1.4.7 or later, apparently) load these files
from ${cups}/share/mime, so we no longer need the symlinks in /etc.
svn path=/nixos/trunk/; revision=29284
2011-09-14 18:20:13 +00:00
Russell O'Connor
1744733be8
Revering CUPS update.
...
svn path=/nixos/trunk/; revision=29283
2011-09-14 17:58:57 +00:00
Peter Simons
02bb4eb289
modules/services/printing/cupsd.nix: MIME related config files have moved to share in cups 1.5
...
svn path=/nixos/trunk/; revision=29254
2011-09-13 20:42:21 +00:00
Peter Simons
a499049ce5
Strip trailing whitespace.
...
svn path=/nixos/trunk/; revision=29246
2011-09-13 18:49:50 +00:00
Peter Simons
d3528a3c4e
modules/system/boot/stage-1-init.sh: added "boot.runSize" option to determine the maximum size of the /run tmpfs
...
svn path=/nixos/trunk/; revision=29245
2011-09-13 18:49:47 +00:00
Peter Simons
c01c41e2da
modules/system/boot/kernel.nix: disable "elevator=cfq" boot parameter for the time being
...
This setting causes the init ram disk to hang indefinitely on some systems.
svn path=/nixos/trunk/; revision=29228
2011-09-12 18:01:18 +00:00
Eelco Dolstra
64340dc03c
* Set OPENSSL_X509_CERT_FILE.
...
svn path=/nixos/trunk/; revision=29225
2011-09-12 17:01:43 +00:00
Eelco Dolstra
7dc59f0bb0
* Zabbix: only enable PostgreSQL if it's on the same machine.
...
svn path=/nixos/trunk/; revision=29185
2011-09-11 15:55:43 +00:00
Yury G. Kudryashov
7a858f2a89
Adjust DM/kde4.nix to latest changes in kde-4.7
...
svn path=/nixos/trunk/; revision=29181
2011-09-11 12:44:54 +00:00
Yury G. Kudryashov
c56a8456ed
Allow full ~/.nixpkgs/config.nix syntax in nixpkgs.config
...
Namely, allow {pkgs}: { packageOverrides = p: ...; };
svn path=/nixos/trunk/; revision=29180
2011-09-11 12:41:47 +00:00
Yury G. Kudryashov
9a096c9ee7
Partially revert r2903
...
The nepomuk&virtuoso problem is solved without polutting $QT_PLUGIN_PATH and/or
$LD_LIBRARY_PATH by patching soprano.
svn path=/nixos/trunk/; revision=29107
2011-09-07 23:11:04 +00:00
Yury G. Kudryashov
bcee582a74
Preserve <standard_session_service_dirs/> in dbus.conf
...
This way *session* dbus daemon loads services from XDG_DATA_DIRS
svn path=/nixos/trunk/; revision=29106
2011-09-07 23:07:05 +00:00
Peter Simons
6c08bf40a6
modules/system/boot/kernel.nix: stripped trailing whitespace
...
svn path=/nixos/trunk/; revision=29101
2011-09-07 20:36:13 +00:00
Eelco Dolstra
ed1bc1e180
* Handle the case where a symlink in /etc needs to change into a
...
directory. This happened with /etc/polkit-1, which used to be a
symlink to /etc/static/polkit-1, which was itself a symlink but now
is a directory. Not handling this correctly led to /etc/static
being clobbered with symlinks pointing to themselves.
svn path=/nixos/trunk/; revision=29061
2011-09-06 12:32:07 +00:00
Eelco Dolstra
4a65eb6830
* Create /var/lib/upower, where upowerd keeps historical battery data.
...
svn path=/nixos/trunk/; revision=29057
2011-09-06 11:18:36 +00:00
Eelco Dolstra
5de82a6802
svn path=/nixos/trunk/; revision=29053
2011-09-05 23:33:29 +00:00
Eelco Dolstra
0de04bd4be
* Xfce 4.6 fix.
...
svn path=/nixos/trunk/; revision=29046
2011-09-05 20:50:15 +00:00
Eelco Dolstra
8d8c250b8f
* Enable gvfs in Xfce.
...
svn path=/nixos/trunk/; revision=29044
2011-09-05 20:37:06 +00:00
Eelco Dolstra
94014f4adc
* Get the Virtuoso backend in Soprano/Nepomuk to work. Soprano tries
...
to find virtodbc_r.so in QT_PLUGIN_PATH (among other locations), so
make sure that Virtuoso can be found there.
svn path=/nixos/trunk/; revision=29033
2011-09-05 17:55:53 +00:00
Eelco Dolstra
4b8275d2c4
* Force loading of the CFQ module, i.e. don't do it on demand — that
...
seems to cause weird modprobe hangs.
svn path=/nixos/trunk/; revision=29027
2011-09-05 14:58:26 +00:00
Eelco Dolstra
453675c5c1
* Allow literal examples to be included in the manual.
...
svn path=/nixos/trunk/; revision=29025
2011-09-05 10:14:42 +00:00
Eelco Dolstra
5813e99fb3
* Fix description.
...
svn path=/nixos/trunk/; revision=29022
2011-09-05 09:46:14 +00:00
Nicolas Pierron
6669cf61f4
Add merge capabilities to nixpkgs.config option.
...
svn path=/nixos/trunk/; revision=29021
2011-09-05 09:19:59 +00:00
Nicolas Pierron
def746fcdd
Add Intel firmwars (iwlwifi-6000g2{a,b}-ucode).
...
svn path=/nixos/trunk/; revision=29020
2011-09-05 09:19:55 +00:00
Eelco Dolstra
0cbdfb2bbf
* Use boot.initrd.availableKernelModules for the QEMU modules.
...
svn path=/nixos/trunk/; revision=28973
2011-09-02 13:20:05 +00:00
Eelco Dolstra
8b3fd3ed49
* Use the CFQ I/O scheduler, rather than the ‘none’ scheduler. This
...
was already the case on Linux 2.6.32, but in newer kernels the CFQ
scheduler is built as a module, so all block devices got the ‘none’
scheduler instead.
svn path=/nixos/trunk/; revision=28972
2011-09-02 13:19:45 +00:00
Lluís Batlle i Rossell
8138feb630
The VM did not want to mount the CIFS without these two modules available in stage1.
...
svn path=/nixos/trunk/; revision=28947
2011-08-31 21:20:48 +00:00
Eelco Dolstra
bd5ca54584
* Add fsck.vfat etc. to the default install. Useful for USB sticks
...
and stuff like that.
svn path=/nixos/trunk/; revision=28934
2011-08-30 18:25:54 +00:00
Yury G. Kudryashov
5ee15d4986
Fix hal evaluation
...
svn path=/nixos/trunk/; revision=28842
2011-08-26 17:30:53 +00:00
Yury G. Kudryashov
c174554ad7
polkit_kde_agent is now kde4.polkit_kde_agent
...
svn path=/nixos/trunk/; revision=28834
2011-08-26 13:50:03 +00:00
Yury G. Kudryashov
42a03ef0eb
Sync with dbus changes in nixpkgs
...
svn path=/nixos/trunk/; revision=28832
2011-08-26 13:46:59 +00:00
Yury G. Kudryashov
ea4630bf97
Allow RUN+="socket:..." in udev rules
...
svn path=/nixos/trunk/; revision=28808
2011-08-25 08:06:09 +00:00
Shea Levy
25594961ad
modprobe.nix: Blacklist snd_pcsp by default
...
svn path=/nixos/trunk/; revision=28805
2011-08-24 23:37:40 +00:00
Yury G. Kudryashov
e5917ea6fc
Merge with udev-173
...
The only conflict was the addition of two different options at the same place.
svn path=/nixos/trunk/; revision=28801
2011-08-24 21:24:39 +00:00
Eelco Dolstra
1aa1c86afc
* Enable upower and udisks for Xfce 4.8.
...
svn path=/nixos/trunk/; revision=28764
2011-08-22 23:10:24 +00:00
Eelco Dolstra
3b1c741f3f
* Xfce 4.8 doesn't need HAL anymore.
...
svn path=/nixos/trunk/; revision=28762
2011-08-22 22:52:13 +00:00
Eelco Dolstra
ecbfe0d9c0
* Cause KDE's Polkit authentication agent to be started at login.
...
You now get a nice popup window asking for the appropriate password
if you try to do something that requires administrative privilege
(e.g. "pkexec ls" in a terminal, unmounting devices that don't
belong to you in Dolphin, or killing other people's processes in
ksysguard).
svn path=/nixos/trunk/; revision=28735
2011-08-22 11:51:03 +00:00
Eelco Dolstra
d1ae2c2ac1
* Polkit: remove the wrapper since it's no longer needed (and didn't
...
really work as far as I can tell).
svn path=/nixos/trunk/; revision=28734
2011-08-22 11:46:32 +00:00
Eelco Dolstra
13a2563d02
* Create /var/lib/udisks because that's where udisks keeps its mtab
...
file. Without this, users are not able to unmount their own
devices (because udisks doesn't remember who mounted them).
svn path=/nixos/trunk/; revision=28730
2011-08-21 21:03:02 +00:00
Eelco Dolstra
7980c71d9c
* Add some options to allow setting PolKit permissions.
...
svn path=/nixos/trunk/; revision=28729
2011-08-21 20:38:45 +00:00
Peter Simons
a84ada1d92
modules/services/monitoring/smartd.nix: pass TZ variable to smartd to ensure that notification e-mails have a proper time zone
...
svn path=/nixos/trunk/; revision=28702
2011-08-19 20:44:12 +00:00
Yury G. Kudryashov
9177fc455d
Adjust nixos to latest changes in kde-4.7 in nixpkgs
...
svn path=/nixos/trunk/; revision=28598
2011-08-15 18:08:12 +00:00
Eelco Dolstra
4790c147bf
* Revert r28400 because ConsoleKit got reverted to 0.4.1.
...
svn path=/nixos/trunk/; revision=28587
2011-08-15 14:48:32 +00:00
Lluís Batlle i Rossell
4bc0bfec4c
Making the system-tarball-pc boot fine with PXE, and include help files and a
...
readme file as examples for an easy PXE setup.
This allows booting the NixOS in the system tarball, and thus allows installing nixos.
svn path=/nixos/trunk/; revision=28585
2011-08-15 14:37:00 +00:00
Lluís Batlle i Rossell
8f6a4be721
Trying to make the system tarball for pc closer to PXE boot.
...
svn path=/nixos/trunk/; revision=28573
2011-08-14 22:01:58 +00:00
Eelco Dolstra
7e2ea4df32
* Xsession script: set the current directory to $HOME.
...
svn path=/nixos/trunk/; revision=28511
2011-08-12 10:04:43 +00:00
Shea Levy
38cab9070f
synaptics module: By default, disable edge drag scrolling if two finger scrolling is enabled
...
svn path=/nixos/trunk/; revision=28472
2011-08-10 22:14:46 +00:00
David Guibert
96304c9afc
make the virtualbox guest module loadable by modprobe.
...
svn path=/nixos/trunk/; revision=28436
2011-08-09 19:53:01 +00:00
Eelco Dolstra
74586fd2bb
* Fix the permissions on /tmp.
...
svn path=/nixos/trunk/; revision=28435
2011-08-09 15:32:39 +00:00
Eelco Dolstra
d75efe4aa1
* For security, don't mount the entire host filesystem.
...
svn path=/nixos/trunk/; revision=28429
2011-08-09 14:07:44 +00:00
Eelco Dolstra
45d8c418b5
* Some hackery to get ConsoleKit to work with the SLIM and "auto"
...
display managers. This was broken due to a change in ConsoleKit
0.4.2:
https://bugs.freedesktop.org/show_bug.cgi?id=28377
Using ConsoleKit's pam-ck-connector helps in that it creates local
sessions; however, they're not marked as active because the
x11-display-device property is not set. As a workaround, calling
ck-launch-session seems to work.
More details:
https://bugs.gentoo.org/show_bug.cgi?id=336634
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=598150
https://bugzilla.redhat.com/show_bug.cgi?id=585952
svn path=/nixos/trunk/; revision=28400
2011-08-08 19:28:17 +00:00
Eelco Dolstra
eba6e0456b
* Use the VESA driver. It seems to work better now. In particular,
...
it doesn't turn blue backgrounds into yellow (see
e.g. http://hydra.nixos.org/build/1232626/download/1/screen.png ).
svn path=/nixos/trunk/; revision=28395
2011-08-08 15:16:42 +00:00
Eelco Dolstra
8b30a8f23f
* In the VM tests, add "-m 0" to syslogd to kill the "-- MARK --"
...
messages. These prevent hanging tests from being killed after 1
hour of silence.
svn path=/nixos/trunk/; revision=28393
2011-08-08 14:40:16 +00:00
Shea Levy
843ccae5d5
multitouch: Use the right package name
...
svn path=/nixos/trunk/; revision=28375
2011-08-08 01:39:26 +00:00
Shea Levy
b17bb81765
multitouch: Actually add it to the module list
...
svn path=/nixos/trunk/; revision=28374
2011-08-08 01:37:49 +00:00
Shea Levy
9464c99ce2
First attempt at a multitouch touchpad module.
...
Note that the Multitouch X Driver currently has no configuration beyond editing the source code, so the only option is enable or disable
svn path=/nixos/trunk/; revision=28373
2011-08-08 01:34:36 +00:00
Shea Levy
30861ecbc8
Create multitouch module based off synaptics module
...
svn path=/nixos/trunk/; revision=28372
2011-08-08 01:27:44 +00:00
Karn Kallio
c36cf7b591
Reflect kdegraphics organization.
...
svn path=/nixos/trunk/; revision=28214
2011-08-07 00:52:35 +00:00
Eelco Dolstra
2af368279c
* Set NIX_PATH to something reasonable.
...
svn path=/nixos/trunk/; revision=28202
2011-08-06 18:55:00 +00:00
Eelco Dolstra
1df952182a
* Only flush the POSTROUTING chain.
...
svn path=/nixos/trunk/; revision=28153
2011-08-04 15:33:40 +00:00
Eelco Dolstra
3fb6026191
* Add smartmontools.
...
svn path=/nixos/trunk/; revision=28121
2011-08-02 06:53:09 +00:00
Eelco Dolstra
8aad8c536f
* Make virtualisation.qemu.options a list.
...
svn path=/nixos/trunk/; revision=28120
2011-08-02 06:52:10 +00:00
Eelco Dolstra
d890e74d9c
* Hacks to keep KDE 4.5 working. The latest D-Bus is more strict in
...
checking function arguments, so DBUS_FATAL_WARNINGS=0 is necessary
to prevent KDE from aborting. Also put the Phonon gstreamer backend
in the environment if available.
svn path=/nixos/trunk/; revision=28113
2011-08-01 14:28:28 +00:00
Eelco Dolstra
7a7d781e6a
* Allow the PulseAudio server to be overriden.
...
svn path=/nixos/trunk/; revision=28112
2011-08-01 13:26:51 +00:00
Eelco Dolstra
44725e50f0
* Apply the resource limits set by security.pam.loginLimits to all PAM
...
services (rather than just login(1)). It's rather unexpected if
resource limits are not applied to (say) users logged in via SSH or
X11.
svn path=/nixos/trunk/; revision=28105
2011-08-01 10:17:18 +00:00
Eelco Dolstra
af22531d38
* Remove the hydra-mirror module from NixOS, it's too specialised.
...
svn path=/nixos/trunk/; revision=28024
2011-07-31 22:00:29 +00:00
Eelco Dolstra
7d69a82b55
* Put the CA certificate bundle in /etc/ssl/certs because Qt expects
...
them there.
svn path=/nixos/trunk/; revision=28009
2011-07-29 19:06:27 +00:00
Rob Vermaas
d0ad799582
bind mount /proc in chroot dureing image creation, to prevent some error
...
svn path=/nixos/trunk/; revision=28002
2011-07-29 14:55:42 +00:00
Eelco Dolstra
fc9f6d0395
svn path=/nixos/trunk/; revision=27991
2011-07-28 16:35:13 +00:00
Eelco Dolstra
31afd2bb2e
* vsftpd: use /var/empty instead of /var/ftp/empty as the empty
...
chroot (the latter doesn't exist).
* vsftpd: make the anonymous user's home read-only, otherwise vsftpd
will fail.
svn path=/nixos/trunk/; revision=27983
2011-07-28 09:42:20 +00:00
Nicolas Pierron
66ffeb3fd9
UPS: Make sure the driver pid files can be stored.
...
svn path=/nixos/trunk/; revision=27979
2011-07-27 20:55:39 +00:00
Nicolas Pierron
ef63ea98f4
Experiment with dual option types (list & attribute sets).
...
svn path=/nixos/trunk/; revision=27978
2011-07-27 20:55:35 +00:00
Nicolas Pierron
e231543033
Add new services: freepops, fuppes and ups.
...
svn path=/nixos/trunk/; revision=27977
2011-07-27 20:55:28 +00:00
Eelco Dolstra
abb2779840
* The write_cd_rules script in udev needs udev in its $PATH.
...
svn path=/nixos/trunk/; revision=27970
2011-07-26 21:01:36 +00:00
Eelco Dolstra
d1f1cfcd41
* Don't make PulseAudio a requirement for KDE, it works fine without
...
it (especially now that KDE doesn't try to start PulseAudio
automatically).
svn path=/nixos/trunk/; revision=27969
2011-07-26 18:34:59 +00:00
Eelco Dolstra
3b374ea326
* Move PulseAudio initialisation below the re-exec to prevent it from
...
being started twice.
svn path=/nixos/trunk/; revision=27968
2011-07-26 18:34:10 +00:00
Eelco Dolstra
3fdc209978
* Start PulseAudio from the X session script.
...
svn path=/nixos/trunk/; revision=27967
2011-07-26 18:16:24 +00:00
Eelco Dolstra
77c85b1de7
* Install /etc/pulse/default.pa and /etc/pulse/system.pa.
...
* If PulseAudio is disabled in the NixOS config, then disable
autospawning of the PulseAudio server in /etc/pulse/client.conf.
svn path=/nixos/trunk/; revision=27966
2011-07-26 17:35:47 +00:00
Eelco Dolstra
aa5f5ed2e5
* I should test first.
...
svn path=/nixos/trunk/; revision=27964
2011-07-26 14:19:06 +00:00
Eelco Dolstra
645205b600
* Add a module for rtkit. The PulseAudio module enables rtkit to
...
acquire real-time priority.
svn path=/nixos/trunk/; revision=27963
2011-07-26 14:14:10 +00:00
Eelco Dolstra
2aaff3aa06
* Restart polkitd in the activation script to force its configuration
...
to be reloaded.
svn path=/nixos/trunk/; revision=27962
2011-07-26 14:13:07 +00:00
Eelco Dolstra
8bf3c2c1bf
* The implementation of the ALSA_PLUGIN_DIRS variable is buggy:
...
because it uses strtok() to modify the environment variable in
place, it only works correctly the first time it's called.
Subsequent calls only see the first directory listed in the
variable. This causes applications such as Audacious to fail
because the Pulse plugin is not in the first directory. However, we
don't actually need $ALSA_PLUGIN_DIRS, because /etc/asound.conf
allows the full path to the Pulse plugin to be specified.
svn path=/nixos/trunk/; revision=27960
2011-07-26 13:00:43 +00:00
Eelco Dolstra
7bdaedb465
* Add a module to enable PulseAudio. It causes all ALSA applications
...
to be rerouted to PulseAudio.
Note that this is distinct from the already existing module
‘services/audio/pulseaudio.nix’ that provides a system-wide
PulseAudio daemon, which is usually not what you want.
svn path=/nixos/trunk/; revision=27958
2011-07-26 01:51:56 +00:00
Eelco Dolstra
a1df35a590
* Don't enable HAL by default anymore. It's obsolete. It's still
...
enabled by modules that need it (KDE < 4.7, Xfce).
* Don't enable the PolicyKit module by default either, it's also
obsolete (replaced by PolKit). It's still enabled if HAL is
enabled.
svn path=/nixos/trunk/; revision=27933
2011-07-25 00:52:59 +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
Eelco Dolstra
2e4acbcf8b
* Add a NixOS module for upower.
...
svn path=/nixos/trunk/; revision=27931
2011-07-25 00:45:52 +00:00
Eelco Dolstra
fcc9cf2d85
svn path=/nixos/trunk/; revision=27930
2011-07-25 00:36:41 +00:00
Eelco Dolstra
1e5bd11a53
* Create /run in the initrd and bind-mount it into the target root.
...
This allows Udev to share its database between stage 1 and 2, which
in turn is expected by the LVM Udev rules.
svn path=/nixos/trunk/; revision=27926
2011-07-24 23:36:30 +00:00
Eelco Dolstra
a9f599154a
* Remove stupid ‘libraryPath’ entries from ~/.config/Trolltech.conf
...
that can randomly cause KDE to fail.
svn path=/nixos/trunk/; revision=27925
2011-07-24 22:07:58 +00:00
Shea Levy
d121bb15b5
Add a NixOS module for the rtl8192c firmware
...
svn path=/nixos/trunk/; revision=27913
2011-07-23 23:01:39 +00:00
Shea Levy
e5dacbe6a8
Only turn ttyBackgrounds on by default when the kernel has splashutils
...
This way users won't need to add ttyBackgrounds.enable = false when upgrading to a new kernel, and if the kernel gets splashutils in the future ttyBackgrounds will be enabled automatically.
svn path=/nixos/trunk/; revision=27911
2011-07-23 18:46:16 +00:00
Shea Levy
5a2d438f24
splashutils is already let-bound to kernelPackages.splashutils, so let's take advantage of it.
...
svn path=/nixos/trunk/; revision=27910
2011-07-23 18:15:55 +00:00
Eelco Dolstra
83846d8417
* NixOS module for Udisks.
...
svn path=/nixos/trunk/; revision=27909
2011-07-23 01:30:36 +00:00
Peter Simons
3a1b6266e4
modules/services/monitoring/smartd.nix: added services.smartd.devices option to configure list of devices to monitor
...
By default -- if this option is unset --, all connected devices will be
monitored. Hard-coding the list of devices is worth-while, though, because this
will also configure smartd to send e-mail messages to 'root' when a test fails.
svn path=/nixos/trunk/; revision=27888
2011-07-21 19:32:15 +00:00
Eelco Dolstra
7c6c50a3bf
* Nuke the KDE icon cache on login.
...
svn path=/nixos/trunk/; revision=27867
2011-07-21 11:16:46 +00:00
Lluís Batlle i Rossell
4e73287456
Adding a syslog parameter to receive log from other devices through the network.
...
svn path=/nixos/trunk/; revision=27866
2011-07-21 07:42:05 +00:00
Eelco Dolstra
68350e646d
* Support KDE 4.7.
...
svn path=/nixos/trunk/; revision=27818
2011-07-18 12:37:13 +00:00
Eelco Dolstra
c45356769e
* /var/lib/kdm needs to be owned by ‘kdm’.
...
* Set KDEDIRS properly in kdm.
svn path=/nixos/trunk/; revision=27817
2011-07-18 12:36:46 +00:00
Eelco Dolstra
63e9ece771
* Support booting into another GRUB boot entry via ‘grub-reboot’.
...
This requires grub.conf to honour the saved_entry GRUB environment
variable.
svn path=/nixos/trunk/; revision=27807
2011-07-17 11:42:44 +00:00