Commit graph

200 commits

Author SHA1 Message Date
Peter Simons 0139f015be modules/config/networking.nix: strip trailing whitespace 2013-04-03 12:48:36 +02:00
Peter Simons e2eaae1155 Let resolvconf 'restart' the nscd service instead of 'reload'ing it.
Sometimes nscd starts up before a /etc/resolv.conf file has been written, and
apparently triggering a cache flush (reload) is not good enough to make it
recover from that problem. To remedy the issue, we restart the service instead.
See <https://github.com/NixOS/nixos/issues/34> for further details.
2013-04-03 12:48:25 +02:00
Nicolas B. Pierron 8b2256686b Merge pull request #123 from MarcWeber/feed-upstream/toList
replace list by listOf using same style as for attrsOf
2013-03-23 16:21:21 -07:00
Peter Simons c5ba924143 Revert "Add /run/nss to LD_LIBRARY_PATH".
Commit c948494342 exports too many shared
objects into the LD_LIBRARY_PATH, which causes problems with mplayer.
2013-03-21 11:25:25 +01:00
Rickard Nilsson be698e93a4 Merge hardware.pulseaudio and services.pulseaudio
More specifically, this removes services.pulseaudio and adds the option
hardware.pulseaudio.systemWide which defaults to false but can be used to turn
on the system-wide PulseAudio server (previously defined in
services.pulseaudio). Since the two PulseAudio modes are mutually exclusive
anyway (maybe not strictly true, but I don't think is a good idea combining
them) its nicer to be able to reuse server and ALSA configuration between them.

Also the system-wide PulseAudio service has been adjusted to systemd, and a few
things has been fixed (there was no alsa.conf before, for example).

The bottomline is that people that was using hardware.pulseaudio before should
be able to keep doing it in exactly the same way, and people that used
services.pulseaudio must switch over to hardware.pulseaudio.systemWide instead.
2013-03-14 23:33:45 +01:00
Marc Weber f3e6b42258 replace list by listOf using same style as for attrsOf 2013-03-14 17:09:21 +01:00
Peter Simons 8f679fef5b Merge pull request #116 from rickynils/nss
Add /run/nss to LD_LIBRARY_PATH
2013-03-13 02:57:32 -07:00
Rob Vermaas 28f3d02c29 symlink /etc/localtime was broken, /etc/localtime now points to a location in tzdata in stead of glibc 2013-03-12 10:56:43 +01:00
Rickard Nilsson 78f3da65ec Revert "nslcd: Require network.target"
This reverts commit af152556e3.

The network target is probably not really required, needs
further testing.
2013-03-12 09:38:22 +01:00
Shea Levy 763835e770 Console key map: Make option uniq
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-09 06:27:27 -05:00
Rickard Nilsson c948494342 Add /run/nss to LD_LIBRARY_PATH
This fixes issues with glibc-binaries (getent for example) that can't
find NSS modules that are not distributed with glibc.

See this discussion:
http://comments.gmane.org/gmane.linux.distributions.nixos/9940
2013-03-07 16:54:42 +01:00
Rickard Nilsson af152556e3 nslcd: Require network.target 2013-03-05 19:45:27 +01:00
Shea Levy bfe6c13f09 D'oh! 2013-03-04 10:03:01 -05:00
Shea Levy 0a81724a88 systemd-sysctl.service: Don't depend on basic.target 2013-03-04 09:57:24 -05:00
Eelco Dolstra 7f7e18cfce Enable hardlink and symlink restrictions
This prevents many time-of-check-time-of-use security bugs.  Ubuntu
enables these by default as well so they shouldn't cause many
problems.
2013-03-02 20:06:02 +01:00
Eelco Dolstra 080bf5614f Add a module for setting sysctl parameters
This adds an option ‘boot.kernel.sysctl’ and generates a file
/etc/sysctl/nixos.conf read by systemd-sysctl.service.
2013-03-02 20:06:02 +01:00
Peter Simons 09bfc9a53e modules/config/fonts.nix: revert "export GDFONTPATH in /etc/profile"
This reverts commit 2802538dc2. The idea
was good, but unfortunately $GDFONTPATH has a different format, i.e.
programs that use this variable don't descend into the directories
listed here like fontconfig does, so we cannot use the same values for
both settings.
2013-02-17 23:13:27 +01:00
Peter Simons 2802538dc2 modules/config/fonts.nix: export GDFONTPATH in /etc/profile
Set the environment variable GDFONTPATH to the list of directories where fonts
are expected to be installed. This is search path is used by same GD-based
applications, such as Gnuplot.

Alternatively, we could rely on fontconfig to achieve the same thing, i.e. by
running

  for n in $(fc-list | sed -r -e 's|^([^:]+):.*$|\1|'); do echo $(dirname "$n"); done | sort | uniq

to get that list at run-time, but the static approach feels more deterministic.
2013-02-17 22:47:08 +01:00
Eelco Dolstra 8ef4074811 Use nss_myhostname from systemd 2013-02-04 15:50:37 +01:00
Eelco Dolstra 1daab1ebf5 environment.etc: Add convenience option 'text'
This allows writing

  environment.etc.hosts.text = "127.0.0.1 localhost";

instead of

  environment.etc.hosts.source = pkgs.writeText "hosts" "127.0.0.1 localhost";
2013-02-03 14:28:18 +01:00
Eelco Dolstra ab238804b8 Turn environment.etc into an attribute set
This provides a more convenient syntax and allows easier overriding.

For example,

  environment.etc = singleton
    { target = "vconsole.conf";
      source = vconsoleConf;
    };

can now be written as

  environment.etc."vconsole.conf".source = vconsoleConf;
2013-02-03 14:28:18 +01:00
Eelco Dolstra 37985ad66b Make xz available by default
NixOS depends on xz anyway, so we may as well make it available.
2013-01-30 15:01:31 +01:00
Rickard Nilsson 27414c4656 nslcd: Adjust service definition to systemd 2013-01-27 20:07:37 +01:00
Eelco Dolstra f0a1e5e356 Use systemd.targets to define ip-up 2013-01-24 15:40:56 +01:00
Rickard Nilsson 4eb2b099e6 Generate share/glib-2.0/schemas/gschemas.compiled in system-path.
This is required to create a gschemas.compiled file with content
from all gschemas. Otherwise, gschemas.compiled will be taken
from a random package, and gsettings programs will not find what
they are looking for. I had to add this to get NetworkManager-applet
to work. You'll also have to add share/glib-2.0 to the pathsToLink
list.

Generating this in the activation script (along with gtk icons
etc), is not the nicest solution. But I have no real idea on
how to modularise it.
2013-01-23 09:10:14 +01:00
Eelco Dolstra 1aaa726e75 Merge remote-tracking branch 'origin/systemd' 2013-01-21 12:45:50 +01:00
Eelco Dolstra ae4e94d9ac Rename ‘boot.systemd’ to ‘systemd’
Suggested by Mathijs Kwik.  ‘boot.systemd’ is a misnomer because
systemd affects more than just booting.  And it saves some typing.
2013-01-16 12:33:18 +01:00
Evgeny Egorochkin 9437db0d88 Power management: add support for AMD CPUs 2013-01-14 09:07:35 +02:00
Michael Raskin 9b7ce4a1b5 Merge pull request #50 from surr/fixes/tzdata
timezone should be taken from recent tzdata rather than glibc
2012-12-29 10:29:21 -08:00
Shea Levy dd131a0c09 Revert "Setting the system utillinux to be utillinuxCurses."
This reverts commit cba4d20280.
2012-12-17 13:09:05 -05:00
Shea Levy 75ec5c609e Merge remote-tracking branch 'upstream/master' into systemd
Conflicts:
	maintainers/scripts/ec2/create-ebs-amis.py
2012-12-17 13:03:56 -05:00
Lluís Batlle i Rossell cba4d20280 Setting the system utillinux to be utillinuxCurses.
The live-dvd was set that way already.
I think some utillinux pieces may be nicer, or have more tools. I don't know
the details though.
2012-12-16 16:03:38 +01:00
Alexander Inyukhin 1ae44e42ed Use zoneinfo from tzdata
This fixes #50
2012-12-15 22:05:32 +04:00
Eelco Dolstra b1da38f564 Merge remote-tracking branch 'origin/master' into systemd 2012-11-30 16:12:04 +01:00
Eelco Dolstra 7435db4f89 Get rid of the last uses of mkAlways
mkAlways is an insane function, mkMerge is much saner.
2012-11-30 15:07:39 +01:00
Rickard Nilsson 6099451662 Add support for nslcd (nss-pam-ldapd) as users.ldap.daemon option 2012-11-20 16:39:45 +01:00
Eelco Dolstra 7efde0740e Add user option ‘isAlias’ to allow one user account to alias another 2012-10-23 13:35:06 +02:00
Jack Cummings 1cbad692c3 Add an option to add 'option=single-request' to /etc/resolv.conf. 2012-10-21 21:49:21 -07:00
Eelco Dolstra c8628e0293 Don't let interfaces get IPv6 addresses if networking.enableIPv6 is false 2012-10-19 15:41:01 -04:00
Eelco Dolstra b4a1893cdd systemd-vconsole-setup: Don't put the X server in non-raw mode
‘systemd-vconsole-setup’ by default operates on /dev/tty0, the
currently active tty.  Since it puts /dev/tty0 in Unicode or ASCII
mode, if the X server is currently active when it runs, keys such as
Alt-F4 won't reach the X server anymore.  So use /dev/tty1 instead.
2012-10-18 11:58:37 -04:00
Eelco Dolstra 161c837c49 Port automatic filesystem creation to systemd 2012-10-12 17:32:36 -04:00
Eelco Dolstra 3f6d53cc97 Move escapeSystemdPath to lib/utils.nix
The new file ‘utils.nix’ is intended for NixOS-specific library
functions (i.e. stuff that shouldn't go into Nixpkgs' lib/).
2012-10-12 17:01:49 -04:00
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