Arie Middelkoop
4d26262878
Some renaming as was mentioned on the mailinglist.
...
Also, removed the firmware-free option because that firmware is already in the kernel package and thus causing collisions otherwise.
svn path=/nixos/trunk/; revision=31527
2012-01-14 09:30:24 +00:00
Arie Middelkoop
50d7a38c82
Added the "conservative" governer to the loaded cpufreq governors when you enable powermanagement.
...
svn path=/nixos/trunk/; revision=31524
2012-01-13 22:25:16 +00:00
Arie Middelkoop
bf1bf4957c
Additional options for synaptics
...
How can you ever work with a touchpad while having finger taps on...
svn path=/nixos/trunk/; revision=31523
2012-01-13 22:23:18 +00:00
Eelco Dolstra
cc41bce79d
* Prevent merging of some options. P.S. maybe string options
...
should be "uniq" by default.
svn path=/nixos/trunk/; revision=31520
2012-01-13 13:26:52 +00:00
Florian Friesdorf
7be82b3f59
fix scsi-link-power-management.nix which broke cpufreq
...
svn path=/nixos/trunk/; revision=31507
2012-01-13 08:46:32 +00:00
Arie Middelkoop
3ef0f14925
Added an option to enable the firmware from 'firmware-linux-nonfree' and 'firmware-linux-free'.
...
svn path=/nixos/trunk/; revision=31502
2012-01-12 17:17:01 +00:00
Florian Friesdorf
0862ca9fa7
sudoers: LOCALE_ARCHIVE, TERMINFO_DIRS for root and %wheel
...
svn path=/nixos/trunk/; revision=31491
2012-01-12 07:54:14 +00:00
Florian Friesdorf
f169f60575
powerManagement.enable sets link_power_management_policy to min_power
...
svn path=/nixos/trunk/; revision=31490
2012-01-12 07:54:09 +00:00
Peter Simons
036e585b42
modules/services/printing/cupsd.nix: tell cups to use 'gstoraster' instead of 'pstoraster'
...
The CUPS filter has been renamed in GNU Ghostscript 9.x. Fortunately,
Ghostscript ships with a MIME conversions file that informs CUPS about this,
so linking that file into /etc/cups works fine. I'm not sure whether it's a
particularly elegant solution, though.
svn path=/nixos/trunk/; revision=31489
2012-01-11 23:17:36 +00:00
Yury G. Kudryashov
98f5e3b3b2
Drop kde4.5-specific code
...
svn path=/nixos/trunk/; revision=31486
2012-01-11 22:58:32 +00:00
Peter Simons
70850268e0
Revert "modules/services/printing/cupsd.nix: fixed path to DataDir"
...
This reverts commit 2a1ce489154c8543bc146a7d99e1a397eb920e1f.
svn path=/nixos/trunk/; revision=31484
2012-01-11 20:48:40 +00:00
Peter Simons
cab4a28361
synaptics: add 'additionalOptions' option
...
svn path=/nixos/trunk/; revision=31469
2012-01-10 18:40:02 +00:00
Peter Simons
6385d51f7e
modules/services/printing/cupsd.nix: fixed path to DataDir
...
svn path=/nixos/trunk/; revision=31457
2012-01-09 16:03:43 +00:00
Florian Friesdorf
66f82c043e
Revert "Revert "add ~/bin to PATH if it exists""
...
sorry m(
svn path=/nixos/trunk/; revision=31246
2012-01-03 17:29:20 +00:00
Florian Friesdorf
68e9f2e09b
Revert "add ~/bin to PATH if it exists"
...
This reverts commit 73bda7c4575b5664d54340db95fec2fa759b6f28.
svn path=/nixos/trunk/; revision=31243
2012-01-03 17:11:21 +00:00
Florian Friesdorf
7b7976ac01
export NIX_PROFILES and NIX_USER_PROFILE_DIR
...
svn path=/nixos/trunk/; revision=31242
2012-01-03 17:11:19 +00:00
Florian Friesdorf
b4765401af
add ~/bin to PATH if it exists
...
svn path=/nixos/trunk/; revision=31235
2012-01-03 14:36:05 +00:00
Florian Friesdorf
007d56b69f
intel-5150.nix: add Intel 5150 wireless firmware support
...
Author: Sergey Mironov <ierton@gmail.com>
svn path=/nixos/trunk/; revision=31231
2012-01-03 14:12:41 +00:00
Peter Simons
8eca4db54a
/etc/profile: do not add ~/bin to $PATH in system-wide init file
...
Users who want a user-specific bin directory to override system paths should
configure that in their user-specific ~/.bashrc, not in the system-wide init
file. The global file shouldn't add directories from user homes to $PATH
without knowing whether those actually exist or whether the users even want
them in $PATH. On my system, for example, there is no ~/bin, so I don't want my
$PATH to look for one. Removing an erroneous entry from $PATH is cumbersome,
but adding one is easy, so it feels better to err on the side of caution.
svn path=/nixos/trunk/; revision=31188
2011-12-31 12:56:45 +00:00
Florian Friesdorf
ea121d0ff9
Revert "EMACSLOADPATH in /etc/profile"
...
svn path=/nixos/trunk/; revision=31187
2011-12-31 06:24:12 +00:00
Florian Friesdorf
a38ca160ec
EMACSLOADPATH in /etc/profile
...
svn path=/nixos/trunk/; revision=31175
2011-12-31 04:14:36 +00:00
Florian Friesdorf
b0fefb876f
unset MOZ_PLUGIN_PATH and TERMINFO_DIRS before setting them
...
svn path=/nixos/trunk/; revision=31174
2011-12-31 04:14:31 +00:00
Florian Friesdorf
221c637356
fix MOZ_PLUGIN_PATH
...
svn path=/nixos/trunk/; revision=31168
2011-12-31 02:57:45 +00:00
Florian Friesdorf
97ce0b1386
MOZ_PLUGIN_PATH based on NIX_PROFILES
...
svn path=/nixos/trunk/; revision=31167
2011-12-31 02:05:51 +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
Florian Friesdorf
da90f06ff8
4965agn was wrongly detected as a 3945abg
...
svn path=/nixos/trunk/; revision=31164
2011-12-30 23:26:06 +00:00
Peter Simons
e91c6ea1ce
modules/system/upstart-events/shutdown.nix: refer to bash binary with full path
...
Upstart won't find a "bash" binary in $PATH when those commands are run, so we
refer to it using an absolute path.
svn path=/nixos/trunk/; revision=31157
2011-12-30 16:57:39 +00:00
Florian Friesdorf
b2eb54ae5a
set TERMINFO_DIRS according to NIX_PROFILES
...
this finally makes rxvt-unicode work without manually linking it's terminfo
svn path=/nixos/trunk/; revision=31145
2011-12-29 19:38:03 +00:00
Florian Friesdorf
05a49f663e
include /share/terminfo into default pathsToLink
...
svn path=/nixos/trunk/; revision=31144
2011-12-29 19:38:00 +00:00
Florian Friesdorf
8ed89125b5
linewrap pathsToLink
...
svn path=/nixos/trunk/; revision=31143
2011-12-29 19:37:54 +00:00
Nicolas Pierron
338bc7b9f8
Fix nixos-option without argument.
...
svn path=/nixos/trunk/; revision=31139
2011-12-29 06:33:34 +00:00
Florian Friesdorf
eb755d4692
switched all mergeOptionString to pkgs.lib.types.string
...
pierron recommended the use of types.string over mergeOptionString, as
it is superior but might break things.
For my system the change evaluated to the exactly same.
svn path=/nixos/trunk/; revision=31138
2011-12-29 00:51:35 +00:00
Florian Friesdorf
3ebc7727f7
Revert "test we have cryptsetup-1.4.1 in initrd"
...
This reverts commit 025f8c40b40fad50086e8761eee61098d8fb2651.
The check was intened for building the initrd of the installer.
svn path=/nixos/trunk/; revision=31137
2011-12-28 22:37:38 +00:00
Florian Friesdorf
0544a008db
Revert "added an "error" to luksroot that should be caught"
...
This reverts commit c7967af35a13f68a8785c142582b639dc8c8e92c.
svn path=/nixos/trunk/; revision=31136
2011-12-28 22:36:26 +00:00
Florian Friesdorf
829bd9a727
added an "error" to luksroot that should be caught
...
svn path=/nixos/trunk/; revision=31135
2011-12-28 22:21:31 +00:00
Florian Friesdorf
c7fd05a650
test we have cryptsetup-1.4.1 in initrd
...
svn path=/nixos/trunk/; revision=31132
2011-12-28 21:46:50 +00:00
Florian Friesdorf
c15aa7aea3
luksroot uses preLVMCommands instead of postDeviceCommands
...
svn path=/nixos/trunk/; revision=31131
2011-12-28 21:46:48 +00:00
Florian Friesdorf
90756a787c
add preLVMCommands hook
...
svn path=/nixos/trunk/; revision=31130
2011-12-28 21:46:45 +00:00
Florian Friesdorf
0a9f3a36ec
luksroot waits for usb drive
...
svn path=/nixos/trunk/; revision=31129
2011-12-28 21:46:42 +00:00
Florian Friesdorf
dd8e725d7d
copy only cryptsetup deps to stage-1 and test cryptsetup
...
popt-0.16 and cryptsetup-1.4.1 both generated pkgconfig (in contrast
to older versions). The pkgconfig files (popt.pc and cryptsetup.pc)
contain references into the store that are not removed by patchelf and
stage-1 fails with errors like: "output is not allowed to refer to
path `/nix/store/qccjhn063cfv171rcaxvxh0yk96zf7l2-cryptsetup-1.4.1'".
Now, only the cryptsetup binaries and its dependencies are copied,
determined by ldd. In addition the cryptsetup binary and lvm are
tested after patchelf has adjusted the library paths.
Thanks to Peter Simons and Eelco Dolstra for giving the rights hints.
svn path=/nixos/trunk/; revision=31128
2011-12-28 21:46:40 +00:00
Florian Friesdorf
d98ecd1d9e
enable testing of extraUtilsCommands after patchelf
...
svn path=/nixos/trunk/; revision=31127
2011-12-28 21:46:35 +00:00
Lluís Batlle i Rossell
5cf6543e6e
Removing unused lines of the nfs-kernel script, and fixing some indentation.
...
svn path=/nixos/trunk/; revision=31120
2011-12-28 09:05:52 +00:00
Lluís Batlle i Rossell
99cca93398
Fixing the race condition on loading nfsd. It was not a modprobe thing like I
...
said on 31113, but again, upstart order.
I restore the usual modprobe procedure.
svn path=/nixos/trunk/; revision=31119
2011-12-28 08:44:24 +00:00
Lluís Batlle i Rossell
ef1755f3c0
I had a bug in my nfs server... just after boot, all clients were receiving
...
"Permission denied" until I run "restart nfs-kernel-exports". "exportfs -ra" did not help.
I tracked that down to some race condition between loading the module nfsd and
starting the daemons. Therefore, I decided to add nfsd to the boot.kernelModules instead
of using modprove with it.
Now it works for my server. No more Permission denied after reboot.
svn path=/nixos/trunk/; revision=31113
2011-12-27 18:08:05 +00:00
Lluís Batlle i Rossell
8bc381c4cd
Fixing the boot sequence in case of only having nfsKernel.client.enable = true, and not server.
...
svn path=/nixos/trunk/; revision=31109
2011-12-27 16:33:10 +00:00
Lluís Batlle i Rossell
0de75cde39
Asking for an interactive shell in case of error umounting filesystems. I've
...
not tested it; sometimes I hit the trouble, but not always.
svn path=/nixos/trunk/; revision=31104
2011-12-26 16:40:13 +00:00
Lluís Batlle i Rossell
2c77b292a6
I reworked the nfs upstart jobs, so they work better on the events of interest of nixos.
...
Related to http://yellowgrass.org/issue/NixOS/109 .
svn path=/nixos/trunk/; revision=31103
2011-12-26 16:06:20 +00:00
Eelco Dolstra
cf36b3db80
* If power management is enabled, set the governor to ‘ondemand’ by
...
default. See
http://www.codon.org.uk/~mjg59/power/good_practices.html
for the reasoning. (Basically, the ‘performance’ and ‘powersave’
governors don't actually provide extra performance or power savings
in most cases.)
It used to be that desktop environments like KDE were able to set
the governor through HAL (e.g. KDE could be configured to switch to
the powersave governor when the user unplugs his laptop). However,
this is no longer the case with upower — it is now expected that
everybody uses the ondemand governor. See
http://old.nabble.com/-PATCH--powerdevil-remove-cpufreq.patch-td27815354.html
* Rename ‘cpuFreqGovernor’ to ‘powerManagement.cpuFreqGovernor’.
* Include cpufreq-utils in the system path if a governor is set, since
we depend on it anyway.
svn path=/nixos/trunk/; revision=30991
2011-12-20 22:44:58 +00:00
Eelco Dolstra
2ff7b1284a
* Handle the util-linux-ng -> util-linux rename
...
(http://hydra.nixos.org/build/1646277/nixlog/1 ).
svn path=/nixos/trunk/; revision=30984
2011-12-20 13:36:11 +00:00
Michael Raskin
d06c45ec86
Let hostname --fqdn find proper hostname
...
svn path=/nixos/trunk/; revision=30976
2011-12-20 12:35:12 +00:00
Yury G. Kudryashov
a87a1bca04
wpa_supplicant: add D-Bus interface
...
svn path=/nixos/trunk/; revision=30972
2011-12-19 23:16:32 +00:00
Peter Simons
ae82e7b048
Added cpuFreqGovernor option to configure a CPU frequency governor.
...
svn path=/nixos/trunk/; revision=30949
2011-12-16 23:44:37 +00:00
Eelco Dolstra
52e6088c88
* utillinuxng -> utillinux.
...
svn path=/nixos/trunk/; revision=30858
2011-12-12 19:02:37 +00:00
Eelco Dolstra
6e95485a28
* Set boot.vesa to false if we don't have a fbcondecor-enabled kernel.
...
svn path=/nixos/trunk/; revision=30802
2011-12-08 12:25:33 +00:00
Shea Levy
e87764e327
Apply mornfall's SANE patches
...
Fix sane-backends to generate udev rules, add a snapshot of sane-backends's unstable repo, and add a SANE nixos module
svn path=/nixos/trunk/; revision=30764
2011-12-05 17:32:45 +00:00
Shea Levy
72d7401976
udev: Ignore commented lines when populating run_progs.
...
Patch by mornfall
svn path=/nixos/trunk/; revision=30763
2011-12-05 16:53:58 +00:00
Shea Levy
868c60c92b
Add mpd module
...
There is room for improvement here. The options in conffile could be broken out into individual options and an extraConfig option added. But I think this looks right.
Patch by mornfall, slightly modified by me
svn path=/nixos/trunk/; revision=30731
2011-12-05 01:51:05 +00:00
Eelco Dolstra
508fea8dac
* Remove the cfq_iosched module.
...
svn path=/nixos/trunk/; revision=30618
2011-11-29 14:19:55 +00:00
Nicolas Pierron
e264d1ab79
Convert users.extraUsers to an option set and add support for openssh
...
authorized_keys file generation.
svn path=/nixos/trunk/; revision=30611
2011-11-29 06:08:55 +00:00
Peter Simons
e4ba69aecf
wvdial: don't make wvdial a system package; only root can run it
...
svn path=/nixos/trunk/; revision=30570
2011-11-25 17:41:47 +00:00
Peter Simons
0cd9ff9fcc
smartd: run smartd daemon using the given search path to improve readability of ps output
...
svn path=/nixos/trunk/; revision=30569
2011-11-25 17:09:44 +00:00
Peter Simons
ef932017fc
smartd: run the mail notification script with ${pkgs.stdenv.shell} rather than /bin/sh
...
svn path=/nixos/trunk/; revision=30568
2011-11-25 17:09:37 +00:00
Eelco Dolstra
8eba736da9
* Use the ‘path’ attribute in Upstart jobs in more places. It's a bit
...
more readable (also in "ps" output).
svn path=/nixos/trunk/; revision=30565
2011-11-25 16:32:54 +00:00
Eelco Dolstra
1d5d7036d0
* Add a module for managing cgroups.
...
svn path=/nixos/trunk/; revision=30551
2011-11-24 18:28:45 +00:00
Peter Simons
9de905ee61
modules/programs/wvdial.nix: added support for configuring wvdial
...
For example, I use the following settings to configure T-Mobile Internet
access on my laptop, which is connected to the cell phone by USB:
| environment.wvdial.dialerDefaults = ''
| Init1 = AT+CGDCONT=1,"IP","internet.t-mobile"
| Modem Type = USB Modem
| Phone = *99#
| ISDN = 0
| Username = tm
| Password = tm
| Modem = /dev/ttyACM0
| Baud = 460800
| '';
svn path=/nixos/trunk/; revision=30489
2011-11-20 10:38:26 +00:00
Eelco Dolstra
d89f4b6c76
* Revert r30370, it's no longer needed.
...
svn path=/nixos/trunk/; revision=30389
2011-11-11 15:02:30 +00:00
Eelco Dolstra
48adcd5510
* Remove xdpyinfo from the $PATH.
...
svn path=/nixos/trunk/; revision=30388
2011-11-11 03:11:32 +00:00
Eelco Dolstra
da542dc1ae
* Added a module for oidentd.
...
svn path=/nixos/trunk/; revision=30381
2011-11-10 23:06:24 +00:00
Eelco Dolstra
21d808ee6c
* Add a module that enables a x11vnc-based terminal server, allowing
...
users to login via VNC. Xvfb servers are started as required to
allow multiple concurrent users.
svn path=/nixos/trunk/; revision=30374
2011-11-10 20:52:23 +00:00
Evgeny Egorochkin
c1d7c0d6bd
Remove swap cipher option because it isn't implemented and is misleading new users
...
svn path=/nixos/trunk/; revision=30371
2011-11-10 16:39:04 +00:00
Evgeny Egorochkin
698a02ee43
PulseAudio: fix config file paths
...
svn path=/nixos/trunk/; revision=30370
2011-11-10 16:37:31 +00:00
Lluís Batlle i Rossell
d9356e9a35
Fixing documentation about the prayer module, and adding a port setting,
...
defaulting to something other than 80 at least.
svn path=/nixos/trunk/; revision=30363
2011-11-09 21:08:50 +00:00
Lluís Batlle i Rossell
de5eedb612
Adding the hostname.domain and localhost.domain to hosts, if possible.
...
Postfix likes this.
svn path=/nixos/trunk/; revision=30362
2011-11-09 21:02:01 +00:00
Lluís Batlle i Rossell
578f83eef4
Adding a module for the prayer webmail.
...
svn path=/nixos/trunk/; revision=30361
2011-11-09 20:48:12 +00:00
Eelco Dolstra
0302e2cc57
* Update AMIs.
...
svn path=/nixos/trunk/; revision=30348
2011-11-08 21:28:42 +00:00
Eelco Dolstra
6b6cee46c7
* By popular demand, provide an ISO with a more recent kernel.
...
svn path=/nixos/trunk/; revision=30344
2011-11-08 19:51:39 +00:00
Eelco Dolstra
fdc51c2c97
* Disable all fbcondecor-related stuff if boot.vesa is disabled.
...
svn path=/nixos/trunk/; revision=30343
2011-11-08 19:43:15 +00:00
Eelco Dolstra
0446f652a2
* Include glxinfo/glxgears in the graphical profile. It's very small.
...
svn path=/nixos/trunk/; revision=30342
2011-11-08 19:18:34 +00:00
Eelco Dolstra
06843a45ef
* Fix auto-login.
...
svn path=/nixos/trunk/; revision=30341
2011-11-08 19:02:51 +00:00
Eelco Dolstra
7d68a36851
* Remove rescue.nix (obsolete).
...
svn path=/nixos/trunk/; revision=30340
2011-11-08 19:02:28 +00:00
Eelco Dolstra
e348fbf7a4
* Allow logging in with an empty password in KDE. This is consistent
...
with SLiM and local console logins.
svn path=/nixos/trunk/; revision=30339
2011-11-08 18:50:42 +00:00
Eelco Dolstra
dd28c62879
* My grep skills are lacking.
...
svn path=/nixos/trunk/; revision=30335
2011-11-08 16:39:13 +00:00
Eelco Dolstra
51a5b775a6
* HAL is obsolete and disabling D-Bus is a bad idea.
...
svn path=/nixos/trunk/; revision=30334
2011-11-08 16:32:24 +00:00
Eelco Dolstra
b69dd8759c
* minimal.nix: don't include base.nix. Also note it's not currently used.
...
svn path=/nixos/trunk/; revision=30333
2011-11-08 16:29:40 +00:00
Eelco Dolstra
f281207ea2
* Disable the RTL 8192c firmware because it doesn't build.
...
svn path=/nixos/trunk/; revision=30332
2011-11-08 16:21:57 +00:00
Eelco Dolstra
295dafed8a
* Refactoring: graphical.nix no longer includes base.nix so that it
...
just does what it says (enable a "graphical" configuration).
* Enable KDM in the graphical CD. The "auto" display manager doesn't
properly handle shutdowns etc.
svn path=/nixos/trunk/; revision=30331
2011-11-08 16:17:37 +00:00
Eelco Dolstra
1cfbae6ed4
* Remove empty.nix since it's no longer used.
...
svn path=/nixos/trunk/; revision=30328
2011-11-08 15:59:46 +00:00
Eelco Dolstra
ba7f635f8b
* Move the hardware bits of base.nix into a separate module,
...
all-hardware.nix. This allows base.nix (which should probably be
renamed to something more descriptive) to be reused without getting
the hardware configuration of the installation CD.
svn path=/nixos/trunk/; revision=30327
2011-11-08 15:58:59 +00:00
Shea Levy
7f7eb341c8
Update the comment in the nixos-option generated configuration.nix in light of r30325
...
svn path=/nixos/trunk/; revision=30326
2011-11-08 15:51:39 +00:00
Eelco Dolstra
a76fe106e7
* nixos-hardware-scan: don't emit an include of an "install profile".
...
That's confusing and wrong: nixos-hardware-scan should just enable
support for the detected hardware, not enable lots of software (let
alone KDE).
svn path=/nixos/trunk/; revision=30325
2011-11-08 15:39:13 +00:00
Eelco Dolstra
3e30d87c26
* aufs2 -> aufs.
...
svn path=/nixos/trunk/; revision=30323
2011-11-08 15:12:11 +00:00
Eelco Dolstra
848485a043
* Remove installation-cd-rescue as it's not used, and the other CDs
...
should also contain all appropriate rescue tools.
svn path=/nixos/trunk/; revision=30320
2011-11-08 14:29:35 +00:00
Eelco Dolstra
5e5328cb2e
* Get the SSH host key from the user data if available. This allows
...
the user to create an instance with a known host key, and thus
permit a secure connection.
svn path=/nixos/trunk/; revision=30242
2011-11-05 01:44:56 +00:00
Eelco Dolstra
3d5f3aa2b4
* Print the host key after sshd has started to prevent a potential race.
...
svn path=/nixos/trunk/; revision=30236
2011-11-04 20:33:24 +00:00
Eelco Dolstra
8a0a0efb48
* Force getting the hostname from EC2.
...
svn path=/nixos/trunk/; revision=30235
2011-11-04 20:06:59 +00:00
Eelco Dolstra
4abfacb468
* In the initrd, automatically mount all available ephemeral disks.
...
This depends on the EC2 instance type, so we have to probe for them.
svn path=/nixos/trunk/; revision=30234
2011-11-04 18:49:59 +00:00
Eelco Dolstra
6f8e30313f
* The "audio" group should always exist, even if the ALSA module is
...
disabled, because udev rules refer to it.
svn path=/nixos/trunk/; revision=30229
2011-11-04 17:40:00 +00:00
Eelco Dolstra
c5955e5474
* In EC2 instances, a kernel panic should cause a reboot, and a
...
problem in stage 1 should cause a panic. (Actually, the latter
should probably kill the instance since we can't repair it
anyway...)
svn path=/nixos/trunk/; revision=30215
2011-11-03 20:11:11 +00:00
Lluís Batlle i Rossell
2825a3a6ae
Allowing 'named' to have a config file apart, as it can have passwords.
...
svn path=/nixos/trunk/; revision=30213
2011-11-03 19:13:52 +00:00