Commit graph

208 commits

Author SHA1 Message Date
Eelco Dolstra
e8de4455ab Update automatic swapfile creation for systemd 2012-10-12 16:47:29 -04:00
Eelco Dolstra
dd3fe9d792 Merge remote-tracking branch 'origin/master' into systemd
Conflicts:
	modules/services/system/nscd.nix
2012-10-08 13:47:37 -04:00
Eelco Dolstra
2b2f0067b8 Add an /etc/hosts entry mapping localhost to ::1 2012-10-07 00:46:24 -04:00
Eelco Dolstra
570e523a88 Remove 127.0.0.1 mapping for the system's hostname
Also remove the <hostname>.<domain> mapping.
2012-10-07 00:40:00 -04:00
Eelco Dolstra
74295866f5 Don't include NSS modules in $LD_LIBRARY_PATH
This is broken because it requires restarting applications to see new
NSS modules.  The proper way to handle NSS modules is through nscd.
See commit 554ae9908b.
2012-10-07 00:37:36 -04:00
Eelco Dolstra
13841d6e47 Use nss-myhostname to ensure that the hostname resolves to something sensible 2012-10-06 21:00:26 -04:00
Eelco Dolstra
757ab7f6d3 Generate nsswitch.conf properly 2012-10-06 20:58:46 -04:00
Eelco Dolstra
8f4d8cf620 Enable the power management module by default
After all, we don't want NixOS machines to contribute to global
warming more than necessary!
2012-10-04 22:10:35 -04:00
Eelco Dolstra
c6d12257f1 systemd: Run the powerManagement.* hooks on suspend/resume
Also, drop pm-utils. Systemd now takes care of suspend/resume.
2012-10-04 17:57:10 -04:00
Eelco Dolstra
08f14b33c1 Merge branch 'master' of github.com:NixOS/nixos into systemd 2012-08-20 11:27:38 -04:00
Eelco Dolstra
1e5a2bca28 Remove HAL
It's obsolete and we no longer use it.
2012-08-17 14:45:43 -04:00
Eelco Dolstra
d18c2afc6f Add an ip-up target for services that require IP connectivity 2012-08-15 15:38:52 -04:00
Eelco Dolstra
4475294f57 Fix a hang during shutdown
Subtle: dhcpcd.service would call resolvconf during shutdown, which in
turn would start invalidate-nscd.service, causing the shutdown to be
cancelled.  Instead, give nscd.service a proper reload action, and do
"systemctl reload --no-block nscd.service".  The --no-block is
necessary to prevent that command from waiting until a timeout occurs
(bug in systemd?).
2012-08-14 16:45:50 -04:00
Eelco Dolstra
be5486813b Add an "adm" group
Journald will chown all journal files to the adm group so that users
in that group can run "journalctl".
2012-08-10 15:25:04 -04:00
Eelco Dolstra
21da462ad5 Merge pull request #25 from shlevy/required-kernel-config
Required kernel config
2012-08-08 10:33:41 -07:00
Shea Levy
d9c03b6447 The kernel needs swap support if swapDevices are enabled 2012-08-07 17:34:10 -04:00
Eelco Dolstra
23cb924fbf Don't try to change the uid/gid of existing users
Unless we search the entire filesystem to do a chown *and* restart
existing processes owned by that user, there is no sensible way that
we can change uids/gids.  So don't try.
2012-08-03 11:03:56 -04:00
Eelco Dolstra
e4ed2120fd Create /etc/locale.conf and /etc/vconsole.conf
Systemd's systemd-vconsole-setup.service reads locale and console
font/keymap settings from these files.  In particular, it sets the
virtual console to UTF-8 mode depending on the LANG setting.

This removed the need for the kbd job.
2012-07-24 13:53:17 -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
73532c3855 Global replace /var/run/current-system -> /run/current-system 2012-07-16 11:34:21 -04:00
Eelco Dolstra
7de6a7e8b0 Rename time.clockLocal -> time.hardwareClockInLocalTime. 2012-07-11 15:33:34 -04:00
Carles Pagès
008493f94c Add option to keep hardware clock in local time. 2012-07-11 15:31:46 -04:00
Peter Simons
56373744b4 modules/config/networking.nix: recognize whether a local DNS resolver is available
resolvconf prefers a locally running BIND resolver over the forwarders; we just
have to tell it whether we have one or not. We use 'config.services.bind.enable'
to make that decision, assuming that people are not going to configure a local
BIND that won't respond to queries on 127.0.0.1. If we run into such a (weird)
case, then we'll need to introduce another variable for that purpose which can
be set independently from 'config.services.bind.enable'.
2012-07-02 15:01:02 +02:00
Eelco Dolstra
872a76b177 Merge branch 'master' of github.com:NixOS/nixos into systemd 2012-06-22 11:11:21 -04:00
Rob Vermaas
df124ebc89 * Make sure time.timeZone can only be defined once. 2012-06-21 12:47:44 +02:00
Eelco Dolstra
cd7872b758 Drop dependency on the old udev 2012-06-19 15:14:54 -04:00
Eelco Dolstra
f213c4ca29 Don't run syslogd and klogd
The systemd journal removes the need for running syslogd and klogd, so
don't start them.
2012-06-19 09:28:04 -04:00
Eelco Dolstra
4a95f8996b To ease migration to systemd, generate units from the ‘jobs’ option
Also get rid of the ‘buildHook’ job option because it wasn't very useful.
2012-06-16 00:19:43 -04:00
Eelco Dolstra
ab86759eb3 Use kmod instead of module-init-tools 2012-06-15 14:18:26 -04:00
Eelco Dolstra
c9be63b83e * Use ‘nologin’ as the default shell for user accounts that are not
allowed to log in.

svn path=/nixos/trunk/; revision=34514
2012-06-14 21:33:59 +00:00
Eelco Dolstra
fae777c264 Merge branch 'master' of github.com:NixOS/nixos into systemd 2012-06-14 12:02:17 -04:00
Eelco Dolstra
fd9604b319 * Oops, fix an incomplete commit.
svn path=/nixos/trunk/; revision=34488
2012-06-13 03:28:03 +00:00
Eelco Dolstra
15d44498f9 * Add a ‘size’ option to ‘swapDevices’ to create swapfiles on the fly.
svn path=/nixos/trunk/; revision=34478
2012-06-12 13:41:51 +00:00
Eelco Dolstra
f21aa7d22c First attempt at using systemd
Basic booting works.  Systemd starts agetty instances on tty1 and
tty2.  Shutdown and journald also work.
2012-06-04 12:51:48 -04:00
Ludovic Courtès
a98ad26fea GNU: Comment `fdisk' out.
svn path=/nixos/trunk/; revision=33907
2012-04-24 12:54:42 +00:00
Eelco Dolstra
d96f330fcf * Slight simplification.
svn path=/nixos/trunk/; revision=33877
2012-04-22 16:28:08 +00:00
Eelco Dolstra
d587329615 * Turn users.extraGroups into an attribute set (using types.loaOf).
Also the gid is looked up in ids.gids if not specified.

svn path=/nixos/trunk/; revision=33860
2012-04-20 12:55:09 +00:00
Eelco Dolstra
235ea24ec4 * Remove unused option "user". Not clear what it was supposed to do.
svn path=/nixos/trunk/; revision=33857
2012-04-20 12:22:08 +00:00
Eelco Dolstra
dccd99b564 * Disable "nixos-gen-seccure-keys": it's not clear what it's for, it's
not documented, and it doesn't seem to be used anywhere.

svn path=/nixos/trunk/; revision=33732
2012-04-10 21:11:11 +00:00
Eelco Dolstra
da6046ef6b * Fix the generation of resolvconf.conf.
svn path=/nixos/trunk/; revision=33435
2012-03-26 22:14:47 +00:00
Lluís Batlle i Rossell
e9d641014d Not everyone runs nscd. Fixing a boot problem for those who don't.
svn path=/nixos/trunk/; revision=33434
2012-03-26 21:01:46 +00:00
Mathijs Kwik
f31fefdfd9 splitted ssh/sshd X11 forwarding logic. Backward compatible change.
You can now set the forwardX11 config option for the ssh client and server separately.

For server, the option means "allow clients to request X11 forwarding".
For client, the option means "request X11 forwarding by default on all connections".

I don't think it made sense to couple them. I might not even run the server on some machines.
Also, I ssh to a lot of machines, and rarely want X11 forwarding. The times I want it,
I use the -X/-Y option, or set it in my ~/.ssh/config.

I also decoupled the 'XAuthLocation' logic from forwardX11.
For my case where ssh client doesn't want forwarding by default, it still wants to set the path for the cases I do need it.

As this flag is the one that pulls in X11 dependencies, I changed the minimal profile and the no-x-libs config to check that instead now.

svn path=/nixos/trunk/; revision=33407
2012-03-25 15:42:05 +00:00
Eelco Dolstra
dde8453a09 * Initialise $LOCALE_ARCHIVE earlier in /etc/profile to prevent the
warning

    -bash: warning: setlocale: LC_TIME: cannot change locale (en_GB.UTF8): No such file or directory

  when $LC_TIME is set in environment.shellInit.

svn path=/nixos/trunk/; revision=33248
2012-03-19 02:53:58 +00:00
Eelco Dolstra
573877c1ac * Use boot.kernelModules everywhere instead of explicit calls to
modprobe.
* Move the implementation of boot.kernelModules from the udev job to
  the activation script.  This prevents races with the udev job.
* Drop references to the "capability" kernel module, which no longer
  exists.

svn path=/nixos/trunk/; revision=33208
2012-03-17 17:26:17 +00:00
Eelco Dolstra
03ebb883d1 * Modularize filesystem support. Filesystems such as btrfs and
reiserfs now have separate modules that are conditional on
  boot.supportedFilesystems and boot.initrd.supportedFilesystems.
  By default, these include the filesystems specified in the fsType
  attribute in fileSystems.  Ext2/3/4 support is currently
  unconditional.

  Also unbreak the installer test (http://hydra.nixos.org/build/2272302). 

svn path=/nixos/trunk/; revision=32954
2012-03-09 14:37:58 +00:00
Eelco Dolstra
6c792b3d9e * A more pragmatic solution to the missing tar manpage problem.
svn path=/nixos/trunk/; revision=32770
2012-03-04 15:47:44 +00:00
Lluís Batlle i Rossell
1b65b427c3 Setting gnutarWithMan in the system path, instead of gnutar. Thus 'man tar'
would work by default.


svn path=/nixos/trunk/; revision=32750
2012-03-03 09:55:08 +00:00
Eelco Dolstra
e8539b6f60 * Generate a resolvconf.conf file for openresolv.
svn path=/nixos/trunk/; revision=32718
2012-03-01 14:46:47 +00:00
Peter Simons
8c88506e05 modules/config/networking.nix: list extraHosts *after* the local hostname
This change allows using extraHosts to specify additional aliases for 127.0.0.1
without overriding the local hostname in the process.

svn path=/nixos/trunk/; revision=32711
2012-02-29 21:25:12 +00:00
Florian Friesdorf
fa344f60d9 pathsToLink: emacs org mode contrib folder
svn path=/nixos/trunk/; revision=31795
2012-01-23 17:14: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
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
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
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
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
Michael Raskin
d06c45ec86 Let hostname --fqdn find proper hostname
svn path=/nixos/trunk/; revision=30976
2011-12-20 12:35:12 +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
Eelco Dolstra
d89f4b6c76 * Revert r30370, it's no longer needed.
svn path=/nixos/trunk/; revision=30389
2011-11-11 15:02:30 +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
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
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
Nicolas Pierron
262e883554 Add more options for LDAP module. (timeLimit, bind.timeLimit, bind.policy)
Patch by Rickard Nilsson.

svn path=/nixos/trunk/; revision=30138
2011-10-30 18:46:31 +00:00
Peter Simons
20b364f4de Reverting revisions 30103-30106: "always set nixpkgs.config.{state,store}Dir", etc.
After the change from revision 30103, nixos-rebuild suddenly consumed
freaky amounts of memory. I had to abort the process after it had
allocated well in excess of 30GB(!) of RAM. I'm not sure what is causing
this behavior, but undoing that assignment fixes the problem. The other
two commits needed to be revoked, too, because they depend on 30103.

svn path=/nixos/trunk/; revision=30127
2011-10-30 15:19:58 +00:00
Shea Levy
09cf6ce70c find modules | fgrep .nix | fgrep -v .svn | fgrep -v nixpkgs.nix | xargs sed -i -e 's|/nix/var|${config.nixpkgs.config.nix.stateDir}|g' -e 's|/nix/store|${config.nixpkgs.config.nix.storeDir}|g'
Don't assume /nix/store or /nix/var in NixOS modules, this is configurable

svn path=/nixos/trunk/; revision=30104
2011-10-29 21:03:57 +00:00
Eelco Dolstra
ce822289c3 * Create /etc/localtime as a symlink to the right zoneinfo file.
However, this won't do anything until we merge the stdenv branch.

svn path=/nixos/trunk/; revision=30071
2011-10-27 19:36:03 +00:00
Nicolas Pierron
47a1941696 LDAP non-anonymous bind.
Patch by Rickard Nilsson.

svn path=/nixos/trunk/; revision=29563
2011-10-02 13:24:10 +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
7a7d781e6a * Allow the PulseAudio server to be overriden.
svn path=/nixos/trunk/; revision=28112
2011-08-01 13:26:51 +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
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
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
6e7ce112bb * Create /etc/shells. KDM in KDE 4.7 requires it.
svn path=/nixos/trunk/; revision=27804
2011-07-17 10:45:49 +00:00
Eelco Dolstra
010a2a7555 * Support creating non-system user accounts.
svn path=/nixos/trunk/; revision=27545
2011-06-27 08:50:30 +00:00
Michael Raskin
be85cdacfd Fix space-containing name processing
svn path=/nixos/trunk/; revision=27313
2011-05-28 20:08:49 +00:00
Michael Raskin
25bb8b3d55 Link TrueType/OpenType fonts to all-fonts directory, too
svn path=/nixos/trunk/; revision=27312
2011-05-28 19:58:43 +00:00
Lluís Batlle i Rossell
8dfc5d041a Adding 'ethers' on nsswitch.
svn path=/nixos/trunk/; revision=26913
2011-04-20 20:59:07 +00:00
Lluís Batlle i Rossell
84bea7a351 I change the ldap settings so pam_unix and 'files' always go in front of ldap,
instead of the opposite. Thus, /etc/passwd has priority over ldap.


svn path=/nixos/trunk/; revision=26834
2011-04-13 20:48:50 +00:00
Eelco Dolstra
28e4ac1af2 * Generically handle the case where $out/share/mime/packages or one of
its parents is a symlink.

svn path=/nixos/trunk/; revision=25776
2011-02-05 06:58:15 +00:00
Sander van der Burg
aa2e768fe4 Another strange error, which I fixed
svn path=/nixos/trunk/; revision=25730
2011-01-30 17:27:24 +00:00
Sander van der Burg
f30f71b7fa Fixed a syntax error
svn path=/nixos/trunk/; revision=25727
2011-01-30 16:13:47 +00:00
Ludovic Courtès
9d984837c9 GNU: Disable GRUB by default on ARM.
svn path=/nixos/trunk/; revision=25719
2011-01-29 23:07:06 +00:00
Eelco Dolstra
ef243b7fc2 * Fix a syntax error in the sleep hook that broke suspend.
svn path=/nixos/trunk/; revision=25038
2010-12-08 19:46:52 +00:00
Lluís Batlle i Rossell
d5fb41795f Adding a wake on lan module.
svn path=/nixos/trunk/; revision=24958
2010-12-02 20:23:45 +00:00
Michael Raskin
c77c3ab22c Remove ttmkfdir reference
svn path=/nixos/trunk/; revision=24662
2010-11-11 13:24:37 +00:00
Ludovic Courtès
dc18e5488a NSS-mDNS: Allow both IPv4 and IPv6 address resolution.
svn path=/nixos/trunk/; revision=24150
2010-10-07 20:10:40 +00:00
Eelco Dolstra
f729f12e4e Some cleanups in the activation script:
* Moved some scriptlets to the appropriate modules.
* Put the scriptlet that sets the default path at the start, since it
  never makes sense not to have it there.  It no longer needs to be
  declared as a dependency.
* If a scriptlet has no dependencies, it can be denoted as a plain
  string (i.e., `noDepEntry' is not needed anymore).

svn path=/nixos/trunk/; revision=23762
2010-09-13 15:41:38 +00:00
Eelco Dolstra
1fcefe39a1 * Add share/emacs to the paths to symlink.
svn path=/nixos/trunk/; revision=23184
2010-08-16 08:00:18 +00:00
Eelco Dolstra
cfb465c7a5 svn path=/nixos/trunk/; revision=23115 2010-08-11 15:10:17 +00:00
Eelco Dolstra
cddc67a653 * Try to load the p4_clockmod kernel module, which provides
CPU frequency scaling on some Intel CPUs.

svn path=/nixos/trunk/; revision=23082
2010-08-10 01:00:09 +00:00
Eelco Dolstra
163a54886c * Include fontconfig in the system path (for fc-list, fc-match etc.).
svn path=/nixos/trunk/; revision=23080
2010-08-10 00:03:36 +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
David Guibert
6c8c1f935a nixos: authenticate through kerberos
config.krb5.enable needs to be set as true.
Also use pam_ccreds to cache Kerberos credentials for offline logins.

svn path=/nixos/trunk/; revision=22986
2010-08-06 08:50:48 +00:00
Eelco Dolstra
86d53a5b8b * Load the cpufreq modules, since these are not loaded automatically
by udev.  The kernel can load governors on demand, but if they are
  not loaded, HAL doesn't know about them and they don't show up in
  the KDE System Settings.

svn path=/nixos/trunk/; revision=22567
2010-07-12 17:50:02 +00:00
Eelco Dolstra
7123115d6f * Call update-mime-database.
svn path=/nixos/trunk/; revision=22528
2010-07-08 12:55:18 +00:00
Eelco Dolstra
bb2d97770e * Move the swap module to config/ because it doesn't provide a task
anymore.  Activating swap devices is now handled by the mountall
  task.

svn path=/nixos/branches/boot-order/; revision=22489
2010-07-06 09:01:15 +00:00
Eelco Dolstra
5702557a65 * Put e2fsprogs etc. in mountall's $PATH so that fsck works.
svn path=/nixos/branches/boot-order/; revision=22151
2010-06-04 15:35:32 +00:00
Eelco Dolstra
6676bbe61d svn path=/nixos/trunk/; revision=22111 2010-06-02 23:02:09 +00:00