Commit Graph

519 Commits

Author SHA1 Message Date
Sander van der Burg
4341ef80d8 Fixed MySQL option
svn path=/nixos/trunk/; revision=10307
2008-01-28 14:55:12 +00:00
Sander van der Burg
a73c26875a Added MySQL service to NixOS
svn path=/nixos/trunk/; revision=10305
2008-01-28 14:30:18 +00:00
Michael Raskin
e5025996ca fontDir compatible with both trunk and (hopefully) stdenv-updates
svn path=/nixos/trunk/; revision=10293
2008-01-25 13:31:59 +00:00
Yury G. Kudryashov
e914d28638 Using default stdenv in fontdir.nix
svn path=/nixos/trunk/; revision=10289
2008-01-25 12:54:32 +00:00
Yury G. Kudryashov
3166d9f687 Made iwlwifi optional, with false default
svn path=/nixos/trunk/; revision=10288
2008-01-25 12:54:27 +00:00
Eelco Dolstra
49e8829053 * Use unionfs to provide a real Live CD, i.e., the files on the CD
appear writable (though all writes go to a tmpfs).  This allows you
  to run Nix operations on the Live CD.  However, we're not quite
  there yet since the CD doesn't have a valid Nix database.  So for
  instance a garbage collect will cause everything to be deleted,
  hanging the system.

svn path=/nixos/trunk/; revision=10276
2008-01-24 16:56:09 +00:00
Michael Raskin
7fa31be440 Tried to do offline install CD, not DVD. Failure, but some parts could be useful.
svn path=/nixos/trunk/; revision=10248
2008-01-22 17:55:57 +00:00
Eelco Dolstra
86484779c7 * Mount usbfs on /proc/bus/usb.
svn path=/nixos/trunk/; revision=10220
2008-01-18 15:18:32 +00:00
Andres Löh
563a6240a3 * updated docs to reflect new xmonad choice
svn path=/nixos/trunk/; revision=10181
2008-01-16 16:53:32 +00:00
Eelco Dolstra
d9ffa7f72e * Manual bug.
svn path=/nixos/trunk/; revision=10179
2008-01-16 15:33:09 +00:00
Michael Raskin
d69cc82771 Moved configuration check option into configuration.nix (environment.checkConfigurationOptions)
svn path=/nixos/trunk/; revision=10157
2008-01-15 16:05:51 +00:00
Eelco Dolstra
26e0f711a9 * Use the aggregator to combine the kernel modules tree with
externally-built modules so that (e.g.) "modprobe nvidia" Just
  Works.

svn path=/nixos/trunk/; revision=10129
2008-01-12 23:37:17 +00:00
Eelco Dolstra
cfed953b5f * Option to enable the Intel 3945 firmware. (It's enabled by
default since it doesn't seem to have the legal issues of
  the Intel 2200 firmware.)
* Firmware loader: don't write in /tmp.  Also a hack to quickly
  test new firmwares.
* Revert r10105 since the build fails if configuration.nix 
  is a symlink.  Anyway copying configuration.nix does not
  necessarily make sense since it can import other expressions,
  which would also have to be copied.  Perhaps a better 
  approach would be to write a serialisation of the config
  to a file (maybe with builtins.toXML).

svn path=/nixos/trunk/; revision=10127
2008-01-12 22:53:13 +00:00
Michael Raskin
4475a74fb8 LiveDVD with X and sources made.
svn path=/nixos/trunk/; revision=10119
2008-01-11 16:59:39 +00:00
Michael Raskin
a11779f912 Gw6c now can be configured not to start automatically
svn path=/nixos/trunk/; revision=10116
2008-01-11 06:36:15 +00:00
Michael Raskin
99a2f550c0 Modifications to grub-menu-builder: copy default kernel and initrd to /boot/nixos-.. , limit menu size
svn path=/nixos/trunk/; revision=10106
2008-01-10 04:43:19 +00:00
Michael Raskin
f667e94752 Now configuration.nix is copied into shared.
svn path=/nixos/trunk/; revision=10105
2008-01-09 16:08:15 +00:00
Eelco Dolstra
fec916552c * Add $prefix/info, set $INFOPATH.
svn path=/nixos/trunk/; revision=10087
2008-01-07 11:46:17 +00:00
Eelco Dolstra
a00f463ffa * Symlink /man in /var/run/current-system/sw so that for
example "man bash" works.  Ideally of course all packages
  should put their man pages under $out/share/man.

svn path=/nixos/trunk/; revision=10086
2008-01-07 11:24:02 +00:00
Michael Raskin
5a29acf6a0 Added module aggregation, also changed non-root shell prompt colour to green
svn path=/nixos/trunk/; revision=10084
2008-01-06 18:45:13 +00:00
Eelco Dolstra
9e00dfe107 * Add a bunch of common SATA modules to the default initrd.
svn path=/nixos/trunk/; revision=10083
2008-01-06 00:51:07 +00:00
Eelco Dolstra
56107c81b0 * Put some help text in /etc/issue on the CD.
svn path=/nixos/trunk/; revision=10076
2008-01-04 17:05:48 +00:00
Eelco Dolstra
3abf5072ce * Installation CD: start a web browser showing the NixOS manual on
tty7.
* Add w3m to the installation CD's path since it's needed for the
  manual anyway.

svn path=/nixos/trunk/; revision=10074
2008-01-04 16:11:12 +00:00
Eelco Dolstra
f4399a1883 * Option to set the Grub background image. To
get the background image to work, you may need
  to set NIXOS_INSTALL_GRUB=1 when calling
  nixos-rebuild to force Grub to be reinstalled
  with splashimage support.

svn path=/nixos/trunk/; revision=10071
2008-01-04 15:02:31 +00:00
Eelco Dolstra
8f0e88d4e5 * Just pass all of Nixpkgs to xserver.nix.
svn path=/nixos/trunk/; revision=10068
2008-01-04 10:54:33 +00:00
Eelco Dolstra
b73424833a * xserver.nix: remove some unnecessary function arguments.
* isClone: changed into a boolean rather than a string "on" or "off".

svn path=/nixos/trunk/; revision=10067
2008-01-04 10:36:14 +00:00
Marc Weber
598848d6af patches provided by Tobias Hammerschmidt
svn path=/nixos/trunk/; revision=10055
2008-01-02 21:16:58 +00:00
Eelco Dolstra
90a0d64bcd svn path=/nixos/trunk/; revision=10051 2008-01-02 15:31:04 +00:00
Eelco Dolstra
5ec82632f2 * Use Nix 0.11.
svn path=/nixos/trunk/; revision=10048
2008-01-02 13:05:24 +00:00
Eelco Dolstra
0cb6f3e5c3 * Missing description.
svn path=/nixos/trunk/; revision=10047
2008-01-02 12:50:46 +00:00
Michael Raskin
27d5e93920 Added choice of sound devices mode.
svn path=/nixos/trunk/; revision=10045
2008-01-02 10:07:52 +00:00
Michael Raskin
ae6104ae59 Fixed a bit about child configurations, added an option to not run X job, but create it, and to export configuration files from it.
svn path=/nixos/trunk/; revision=9986
2007-12-31 08:52:59 +00:00
Michael Raskin
b3fa4f1e4e Added some xfs and general font changes.
svn path=/nixos/trunk/; revision=9966
2007-12-25 12:16:38 +00:00
Michael Raskin
f81bebe2d7 Added possibility of building multiple configurations by one nixos-rebuild.
svn path=/nixos/trunk/; revision=9959
2007-12-20 11:36:30 +00:00
Michael Raskin
6733486ec8 Corrected fontDir builder; beginning of changes to allow configuration having multiple variaions in GRUB menu/
svn path=/nixos/trunk/; revision=9957
2007-12-20 04:36:30 +00:00
Michael Raskin
189a608cf5 Now copyKernels allows both /nix/store and /boot be on separate partitions (you need to specify where /boot is for this).
svn path=/nixos/trunk/; revision=9949
2007-12-16 18:56:36 +00:00
Eelco Dolstra
4ef15fc095 * Statically check whether the generated httpd.conf is correct.
* Option `noUserDir' -> `enableUserDir', negatives are bad :-)

svn path=/nixos/trunk/; revision=9927
2007-12-12 15:30:17 +00:00
Eelco Dolstra
6f5da72337 * Start of a nicer Apache configuration than the old stuff in the
services tree.  This one does the generation of httpd.conf in
  the Nix expression language instead of in a builder.

svn path=/nixos/trunk/; revision=9926
2007-12-12 13:58:15 +00:00
Eelco Dolstra
becb4b69c1 Allow the hostname to be empty (to obtain it using dhcp).
svn path=/nixos/trunk/; revision=9857
2007-12-04 15:02:48 +00:00
Eelco Dolstra
d987b16112 * More declarative specification of the DHCPD config.
svn path=/nixos/trunk/; revision=9856
2007-12-04 14:53:37 +00:00
Michael Raskin
aeced64d0e Added PostgreSQL job.
svn path=/nixos/trunk/; revision=9830
2007-12-03 04:48:31 +00:00
Yury G. Kudryashov
5cd638aad8 new option: paths to link to /var/run/current-system/sw
svn path=/nixos/trunk/; revision=9828
2007-12-01 20:44:27 +00:00
Eelco Dolstra
9dd7891820 * Options for configuring the (mail) domain.
svn path=/nixos/trunk/; revision=9785
2007-11-23 17:12:37 +00:00
Eelco Dolstra
e7e685e4ce * Allow Upstart jobs to declare extra configuration for Apache.
Did this for Nagios.  Soon we can rename upstart-jobs to 
  services/plugins/whatever (i.e. an Upstart job will just be 
  one kind of configuration item that a plugin can declare).

svn path=/nixos/trunk/; revision=9778
2007-11-23 10:56:12 +00:00
Eelco Dolstra
1089c1f7fa * Fix the manual.
svn path=/nixos/trunk/; revision=9769
2007-11-21 14:39:52 +00:00
Eelco Dolstra
b880647870 * Options users.extraUsers and users.extraGroups to specify additional
users and groups that the system should create automatically.

svn path=/nixos/trunk/; revision=9705
2007-11-16 13:26:34 +00:00
Eelco Dolstra
f6fd10cbd8 * Support for system-wide distributed / multi-platform builds.
Just set nix.distributedBuilds to true and nix.buildMachines 
  to a list of machines that can perform Nix builds via SSH,
  and local builds will be forwarded appropriately.  So now
  any user can say something like

    nix-build /etc/nixos/nixpkgs/ --arg system '"powerpc-linux"' -A libxml2

  and the build for powerpc-linux will be forwarded to a machine 
  of that type.

svn path=/nixos/trunk/; revision=9696
2007-11-15 17:16:16 +00:00
Michael Raskin
de01f56b42 Corrected some SVN service glitches; added switchable Nix
svn path=/nixos/trunk/; revision=9662
2007-11-13 15:51:24 +00:00
Eelco Dolstra
8b85db0728 * Upstart job for Nagios (system/network monitoring daemon).
svn path=/nixos/trunk/; revision=9658
2007-11-12 16:43:35 +00:00
Eelco Dolstra
646c2e4dec * Put user "root" in the group "root".
svn path=/nixos/trunk/; revision=9654
2007-11-12 14:59:23 +00:00
Eelco Dolstra
a0f5a93229 * Create /var/tmp.
svn path=/nixos/trunk/; revision=9653
2007-11-12 14:45:26 +00:00
Michael Raskin
7d94e2ed4d Removed bad characters in descriptions, changed system.nix checker invokation
svn path=/nixos/trunk/; revision=9620
2007-11-10 13:35:15 +00:00
Eelco Dolstra
2fc94b76fe * Eliminate all calls to config.get.
svn path=/nixos/trunk/; revision=9619
2007-11-09 18:49:45 +00:00
Eelco Dolstra
62c1f0ddcc * Converted the option declarations in options.nix to nested attribute
sets that match the hierarchical structure of the options.  So
  instead of

    {
      name = ["time" "timeZone"];
      default = "CET";
      example = "America/New_York";
      description = "The time zone used when displaying times and dates.";
    }

  we have

    time = {
      timeZone = {
        default = "CET";
        example = "America/New_York";
        description = "The time zone used when displaying times and dates.";
      };
    };

  And instead of `config.get ["time" "timeZone"]' you can now just say
  `config.time.timeZone'.  Furthermore, this option representation
  will allow option structures with repetition (such as in
  networking.interfaces or services.httpd.subservices) to be defined.

svn path=/nixos/trunk/; revision=9618
2007-11-09 18:12:23 +00:00
Eelco Dolstra
5bb4e343b4 * Configuration options networking.defaultMailServer to enable direct mail
delivery without a local mail server (via ssmtp).
* Add vimDiet to the CD, not the system path in general.

svn path=/nixos/trunk/; revision=9607
2007-11-08 18:15:12 +00:00
Marc Weber
89670079ab vimDiet and reiserfsprogs added to systemPathList
svn path=/nixos/trunk/; revision=9600
2007-11-07 22:00:05 +00:00
Eelco Dolstra
81c7e17e02 * An option nix.useChroot to enable chroot builds in NixOS.
svn path=/nixos/trunk/; revision=9583
2007-11-05 11:19:51 +00:00
Michael Raskin
8c9d312e21 Added xfs; fixed nixos-checkout
svn path=/nixos/trunk/; revision=9579
2007-11-05 08:54:30 +00:00
Michael Raskin
b494c20cb5 Small correction to xserver.nix for compiz; also nixos-checkout now creates services where it should be.
svn path=/nixos/trunk/; revision=9578
2007-11-05 08:33:12 +00:00
Michael Raskin
0ff3fc1882 Added option tcpEnable for X server. Needed for xmove.
svn path=/nixos/trunk/; revision=9532
2007-10-26 05:52:35 +00:00
Michael Raskin
b4be8e3b92 Added a way to add arbitrary entries in /etc/hosts .
svn path=/nixos/trunk/; revision=9528
2007-10-26 04:49:44 +00:00
Michael Raskin
e4626e0f0d Added some options for manual text insertion into xorg.conf . Removed (commented out) MonitorLayout by default. It was the thing that prevents i915GM on laptops from working. Those who need it can add it back in extraDeviceOptions.
svn path=/nixos/trunk/; revision=9527
2007-10-26 04:28:01 +00:00
Yury G. Kudryashov
607a32c86f Fixed typo in options.nix
svn path=/nixos/trunk/; revision=9494
2007-10-19 19:15:48 +00:00
Eelco Dolstra
2cc89b09e6 * Create /dev/{stdin,stdout,stderr}.
svn path=/nixos/trunk/; revision=9416
2007-10-06 18:53:50 +00:00
Michael Raskin
5c08d306e5 Some more corrections to fontDir; now suitable as fontPath for Xvnc
svn path=/nixos/trunk/; revision=9410
2007-10-05 12:51:05 +00:00
Michael Raskin
9ce2dbf8d3 Corrected X11-fonts, now it is linked in /var/run/current-system
svn path=/nixos/trunk/; revision=9409
2007-10-05 07:45:56 +00:00
Michael Raskin
44d09afffb Added dir option to link all fonts into share.
svn path=/nixos/trunk/; revision=9407
2007-10-05 07:25:13 +00:00
Eelco Dolstra
94b7b9377c * Option fonts.enableGhostscriptFonts to make the Ghostscript fonts
available to X11 apps.

svn path=/nixos/trunk/; revision=9401
2007-10-03 15:44:30 +00:00
Eelco Dolstra
f402fd73f2 * Print a sensible error message if there are multiple declarations
for an option.
* Removed double declaration for services.xserver.layout.

svn path=/nixos/trunk/; revision=9398
2007-10-03 13:27:45 +00:00
Michael Raskin
33aa5d2d74 Separated keep-alive and additional keep-alive ping frequency.
svn path=/nixos/trunk/; revision=9384
2007-09-30 21:10:11 +00:00
Michael Raskin
cf1140ee11 Added option for external firmware.
svn path=/nixos/trunk/; revision=9379
2007-09-28 07:58:40 +00:00
Eelco Dolstra
c43dc7b013 * Allow Upstart's init to be upgraded in a running system.
svn path=/nixos/trunk/; revision=9375
2007-09-27 12:24:05 +00:00
Michael Raskin
51626b0b66 Added checking of unkonwn options in configuration.nix and a system-wide font set changer.
svn path=/nixos/trunk/; revision=9370
2007-09-25 19:00:20 +00:00
Michael Raskin
07fd13f20e Added keyboard layout to options and internal AGPGART option
svn path=/nixos/trunk/; revision=9369
2007-09-24 19:32:21 +00:00
Michael Raskin
2cf1edf365 Added language switch support to xserver.nix
svn path=/nixos/trunk/; revision=9367
2007-09-24 09:19:34 +00:00
Michael Raskin
a34885af7e Added synaptics support to xserver upstart-job.
svn path=/nixos/trunk/; revision=9366
2007-09-24 09:02:43 +00:00
Michael Raskin
8f126de2fb Changed X server upstart expression a bit, now works for my Intel 915GM notebook (with vesa at least).
svn path=/nixos/trunk/; revision=9364
2007-09-24 05:16:15 +00:00
Eelco Dolstra
f2780fdc62 * Add a top-level default.nix for NixOS which has attributes useful
for building parts of the system.  E.g.

  $ nix-build /etc/nixos/nixos -A upstartJobs.xserver

  to build the Upstart job for the X server, or

  $ nix-build /etc/nixos/nixos -A kernel

  to build the NixOS kernel.

* /etc/profile.sh: if ~/.nix-defexpr doesn't exist yet, create it as a
  directory and add links to root's channels, /etc/nixos/nixos and
  /etc/nixos/install-source.nix (as "nixpkgs_sys").
  
* boot.useKernel -> boot.kernel.

svn path=/nixos/trunk/; revision=9334
2007-09-18 15:06:24 +00:00
Yury G. Kudryashov
867d814d27 Remove unneeded copy of lvm in initrd.
Something replaces symlinks in initrd with copies. Removed symlinks to lvm and
changed syntax (vgscan -> lvm vgscan).

svn path=/nixos/trunk/; revision=9233
2007-09-01 18:05:46 +00:00
Eelco Dolstra
475ee4548d * Create /nix/var/nix/gcroots/per-user.
svn path=/nixos/trunk/; revision=9189
2007-08-22 14:58:51 +00:00
Michael Raskin
f7d2ccdb87 Added mod_php option for httpd.
svn path=/nixos/trunk/; revision=9155
2007-08-18 15:19:27 +00:00
Eelco Dolstra
2a4417d637 * make-etc / activate-configuration: allow /etc files to be installed
as regular files instead of symlinks to the store.
* Sudo configuration, enabled through security.sudo.enable (on by
  default).  The contents of the sudoers file is specified in
  security.sudo.configFile.  The default sudoers file allows members
  of the new "wheel" group to run any command.

svn path=/nixos/trunk/; revision=9138
2007-08-16 15:09:06 +00:00
Eelco Dolstra
ad22e587ab * nixos-rebuild: do a nix-pull on the Nixpkgs channel manifest. I.e., you
don't need to be subscribed to the Nixpkgs channel to get binary downloads.
  This is possible because nix-pull is now pretty fast.

svn path=/nixos/trunk/; revision=9133
2007-08-15 12:01:20 +00:00
Eelco Dolstra
cc3803f207 * An Upstart job for ifplugd, which monitors Ethernet interfaces
for cables being plugged in or unplugged.  When this occurs, the
  dhclient service is restarted to automatically obtain a new IP 
  address.  This is useful for roaming users (laptops).

svn path=/nixos/trunk/; revision=9124
2007-08-14 16:43:56 +00:00
Eelco Dolstra
05e9b29525 * Search /nix/var/nix/manifests for GC roots under NixOS.
svn path=/nixos/trunk/; revision=9090
2007-08-09 23:54:23 +00:00
Michael Raskin
bb25a6ef96 Added short keep-alive period to gw6c, added ircd-hybrid service.
svn path=/nixos/trunk/; revision=9071
2007-08-08 20:42:25 +00:00
Wouter den Breejen
13f94dacc5 Added mirrors for bootsplash.de files
svn path=/nixos/trunk/; revision=9008
2007-07-20 12:33:46 +00:00
Michael Raskin
055a950331 Apache httpd customization - extraDirectories & noUserDir .
svn path=/nixos/trunk/; revision=8985
2007-07-15 11:16:01 +00:00
Michael Raskin
bf1033d2cb Added Gateway6 upstart-job and options for it. Sudo configuration for PAM
is added (it is needed anyway), but still only NOPASSWD entries work.

svn path=/nixos/trunk/; revision=8966
2007-07-09 11:21:04 +00:00
Eelco Dolstra
2cfd8c9a3a * Work properly when lvm is disabled.
svn path=/nixos/trunk/; revision=8947
2007-07-05 14:19:48 +00:00
Yury G. Kudryashov
cd1023c50d * Added boot.initrd.lvm flag for use NixOS with LVM2 root partition.
* Added sis support for xserver.

svn path=/nixos/trunk/; revision=8924
2007-06-28 09:57:36 +00:00
Michael Raskin
58b29cd565 Added possibility to give configurations custom names.
svn path=/nixos/trunk/; revision=8915
2007-06-23 16:09:05 +00:00
Michael Raskin
f0d1570377 Added kernel selection parameter, boot.useKernel
svn path=/nixos/trunk/; revision=8914
2007-06-23 15:48:09 +00:00
Michael Raskin
0e92d41124 Added configuration.nix option to add entries into nix.conf .
svn path=/nixos/trunk/; revision=8910
2007-06-21 17:14:33 +00:00
Eelco Dolstra
c819d76ec7 * Option boot.extraGrubEntries to add arbitrary text to Grub's menu.lst.
svn path=/nixos/trunk/; revision=8883
2007-06-15 11:40:57 +00:00
Eelco Dolstra
f3f16dc169 * ALSA requires a group named "audio".
svn path=/nixos/trunk/; revision=8863
2007-06-10 20:17:51 +00:00
Eelco Dolstra
4d4387a70e * Allow jobs to specify groups.
svn path=/nixos/trunk/; revision=8862
2007-06-10 20:13:12 +00:00
Eelco Dolstra
1f1db4c48f * Use pam_console to change the ownership of various devices (sound,
CD-ROM drive, etc.) to the logged in user.  Woohoo!  Finally, no
  more chown /dev/snd/*.
* Get rid of spurious error messages about pam_ldap when we're not
  using LDAP.

svn path=/nixos/trunk/; revision=8861
2007-06-10 20:02:07 +00:00
Eelco Dolstra
258ef4bf19 * Upstart job for HAL.
svn path=/nixos/trunk/; revision=8854
2007-06-09 20:05:04 +00:00
Eelco Dolstra
f70df0b275 * Added a job to start the D-Bus system-wide message bus daemon.
svn path=/nixos/trunk/; revision=8848
2007-06-08 18:56:55 +00:00
Eelco Dolstra
29c5178bdf * Declarative specification of user accounts. Jobs can now specify a
list of user accounts that the job needs to run.  For instance, the
  SSH daemon job says:

    { name = "sshd";
      uid = (import ../system/ids.nix).uids.sshd;
      description = "SSH privilege separation user";
      home = "/var/empty";
    }

  The activation script creates the system users/groups and updates
  them as well.  So a change in the Nix expression can be realised in
  /etc/{group,passwd} by running nixos-rebuild.

svn path=/nixos/trunk/; revision=8846
2007-06-08 15:41:12 +00:00
Eelco Dolstra
566c723986 * Allow the SLiM theme to be overriden.
* Delete the SLiM log file on X startup.

svn path=/nixos/trunk/; revision=8832
2007-06-05 11:51:59 +00:00
Wouter den Breejen
2e50d9cd58 nixos dir: Xserver and samba nixos
svn path=/nixos/trunk/; revision=8784
2007-05-28 14:09:04 +00:00
Eelco Dolstra
aab8fda25a * Option `networking.localCommands' to specify shell commands to be
executed after the network interfaces have been initialised.

svn path=/nixos/trunk/; revision=8752
2007-05-24 14:50:17 +00:00
Eelco Dolstra
4f5de40814 * Add sysvtools to the system path.
svn path=/nixos/trunk/; revision=8738
2007-05-23 14:29:34 +00:00
Eelco Dolstra
7243eb1d1d * Create /bin on the CD to suppress the /bin/sh symlink creation
error.
* Put the top-level system config on the CD, otherwise root doesn't
  get a working login shell on the CD (and the system PATH is broken
  as well).

svn path=/nixos/trunk/; revision=8658
2007-05-09 17:32:41 +00:00
Eelco Dolstra
a779e582cb * Doh.
svn path=/nixos/trunk/; revision=8651
2007-05-02 22:18:57 +00:00
Eelco Dolstra
66f0d29a48 * Use the new Intel driver.
svn path=/nixos/trunk/; revision=8633
2007-05-01 15:27:50 +00:00
Eelco Dolstra
c1d072c17d * Added `time' to the system path.
svn path=/nixos/trunk/; revision=8600
2007-04-20 08:51:41 +00:00
Eelco Dolstra
3ab4e0f17f * Allow packages to be added to the system path like so:
environment = {
    extraPackages = pkgs: [
      pkgs.firefox
      pkgs.thunderbird
    ];
  };

  This approach is often actually nicer than adding to the default
  profile using nix-env, since it's declarative, and all packages
  declared here will be updated automatically when you run
  nixos-rebuild.

* Allow additional setuid programs to be specified in
  security.extraSetuidPrograms.

svn path=/nixos/trunk/; revision=8548
2007-04-07 21:44:26 +00:00
Eelco Dolstra
174f4f2c99 * Set the console font, the keymap, and Unicode/ASCII mode.
svn path=/nixos/trunk/; revision=8542
2007-04-04 17:10:38 +00:00
Eelco Dolstra
464d252d55 * Set the LANG environment variable (default is en_US.UTF-8,
can be overriden through the system configuration).

svn path=/nixos/trunk/; revision=8541
2007-04-04 13:47:54 +00:00
Eelco Dolstra
a9635d3b73 * Upstart job for the CUPS daemon.
svn path=/nixos/trunk/; revision=8534
2007-04-02 17:31:58 +00:00
Eelco Dolstra
e312a8ef64 * Start the SSH agent on X11 login.
svn path=/nixos/trunk/; revision=8531
2007-04-02 15:01:09 +00:00
Eelco Dolstra
f10a95e88e * Refactoring: move stuff around.
svn path=/nixos/trunk/; revision=8506
2007-03-30 12:59:43 +00:00
Eelco Dolstra
bf92844f16 * Allow Upstart jobs to declare additional /etc files.
svn path=/nixos/trunk/; revision=8505
2007-03-30 12:55:09 +00:00
Eelco Dolstra
100efeeafe * Specify the location of XKeyboard related stuff.
svn path=/nixos/trunk/; revision=8501
2007-03-30 12:33:42 +00:00
Eelco Dolstra
1bd112d4a7 * Set the TZDIR variable so that the KDE clock can find the timezone
definitions (NIXOS-56).

svn path=/nixos/trunk/; revision=8488
2007-03-29 17:46:36 +00:00
Eelco Dolstra
9cb9621fec * Start KDE properly. Make sure that some essential packages such as
iceauth are in the system path when we're using KDE.

svn path=/nixos/trunk/; revision=8472
2007-03-28 21:16:35 +00:00
Eelco Dolstra
603e598a84 * Add wireless-tools to the system path.
svn path=/nixos/trunk/; revision=8471
2007-03-28 21:15:23 +00:00
Eelco Dolstra
5c984a7b99 * Don't include ~/.bashrc.
svn path=/nixos/trunk/; revision=8413
2007-03-26 08:54:11 +00:00
Eelco Dolstra
128660d8e2 * Root installs in the system-wide profile
(/nix/var/nix/profiles/default) by default.
* In /etc/profile, put /var/run/current-system/sw/[s]bin in $PATH, not
  the targets of those symlink.  Otherwise users need to log out to
  make configuration changes to the systemPath take effect.

svn path=/nixos/trunk/; revision=8384
2007-03-20 13:50:47 +00:00
Eelco Dolstra
be8bcebfe0 * Use /var/run/current-system/sw/bin/bash as the default shell for new
accounts.  Obviously we cannot put the store path of bash in
  /etc/passwd since it's too fragile (it could be garbage collected),
  hence this indirection.

svn path=/nixos/trunk/; revision=8383
2007-03-20 13:30:14 +00:00
Eelco Dolstra
c10fe148a3 * /var/run/current-system symlinks to the top-level path of the system
configuration now.
* /var/run/booted-system symlinks to the system configuration used at
  boot time.

svn path=/nixos/trunk/; revision=8381
2007-03-20 13:01:53 +00:00
Eelco Dolstra
80a0904196 * Set /var/run/current-system to the currently active system
configuration, and use it as a garbage collection root to prevent
  the current configuration from being GC'ed (which was previously
  possible if the configuration was activated using "nixos-rebuild
  test", or if the configuration's generation symlink had been removed
  from the system profile).

  This isn't quite right yet due to a layering problem:
  activate-configuration.sh doesn't know the top-level store path of
  the configuration.

svn path=/nixos/trunk/; revision=8379
2007-03-20 11:45:59 +00:00
Eelco Dolstra
9e9d6a4c62 * Use a bash built with ncurses support for logins.
svn path=/nixos/trunk/; revision=8376
2007-03-20 10:40:45 +00:00
Eelco Dolstra
8452dd3cd0 * Upstart job for dhcpd.
svn path=/nixos/trunk/; revision=8311
2007-03-16 16:41:38 +00:00
Eelco Dolstra
4e292cb1ae * Remove unnecessary control characters from PS1.
svn path=/nixos/trunk/; revision=8275
2007-03-13 11:27:15 +00:00
Eelco Dolstra
8851530afb * Setting boot.localCommands for anything you want to execute before
Upstart is started.

svn path=/nixos/trunk/; revision=8229
2007-03-06 00:45:33 +00:00
Eelco Dolstra
8d731dacad * X session script:
- Set the desktop background to the image ~/.background-image.
  - Depending on services.xserver.sessionType, start an xterm or a
    gnome-terminal as the "desktop" :-)

* Upstart jobs can now declare extra packages to be added to the
  system path through the `extraPath' attribute.  For instance, the
  ALSA job adds alsa-utils, and the X server job adds lots of stuff
  depending on the X configuration (e.g., xrandr, gnome-terminal,
  twm).

* Create a cdrom/dvd symlink for SCSI sr? devices.

svn path=/nixos/trunk/; revision=8221
2007-03-06 00:07:00 +00:00
Eelco Dolstra
797524528b * Doh.
svn path=/nixos/trunk/; revision=8168
2007-03-04 13:15:11 +00:00
Eelco Dolstra
119df37858 * Generate a wrapper around modprobe that sets MODULE_DIR. This is
important for /proc/sys/kernel/modprobe, i.e., modprobing by the
  kernel.

svn path=/nixos/trunk/; revision=8164
2007-03-04 01:16:24 +00:00
Eelco Dolstra
90f1dbe548 * Set some wireless settings (ESSID, WEP key).
svn path=/nixos/trunk/; revision=8163
2007-03-04 00:40:59 +00:00
Eelco Dolstra
2bff886ae1 * Udev rules/script to load device firmware automatically. The udev
job takes a list of firmware directories in which to search for
  firmware files.  Right now this is just the Intel 2200 firmware (if
  enabled).

svn path=/nixos/trunk/; revision=8162
2007-03-03 23:20:08 +00:00
Eelco Dolstra
1a9f5e455e * Don't restart the X server if the xserver job changes, as that would
kill the X clients.

svn path=/nixos/trunk/; revision=8161
2007-03-03 23:18:56 +00:00
Eelco Dolstra
1a66b71e2d * Set NIX_REMOTE when logging in through SSH. Quick hack. Should really
figure out why the environment isn't initialised properly in
  non-interactive SSH logins.

svn path=/nixos/trunk/; revision=8136
2007-03-01 15:31:05 +00:00
Eelco Dolstra
ba56551986 * ALSA support: save/restore the volume settings, create device nodes
in /dev/snd.

svn path=/nixos/trunk/; revision=8124
2007-03-01 00:36:00 +00:00
Eelco Dolstra
a177575779 * Handle windowManager == "compiz". Load Compiz's GConf settings
automatically and turn on most plugins.

svn path=/nixos/trunk/; revision=8122
2007-03-01 00:00:16 +00:00
Eelco Dolstra
5799fe7382 * Some hackery to get Metacity to find its default settings. GConf is
really evil: it requires applications to install their GConf schemas
  into one of a fixed set of directories that gconfd searches.  This
  is of course rather imperative.

svn path=/nixos/trunk/; revision=8120
2007-02-28 23:18:16 +00:00
Eelco Dolstra
8960f038dd * Allow metacity as the window manager.
svn path=/nixos/trunk/; revision=8119
2007-02-28 23:00:09 +00:00
Eelco Dolstra
31d91b4ec1 * Set build-max-jobs in the Nix configuration file from the NixOS
configuration file.

svn path=/nixos/trunk/; revision=8109
2007-02-28 16:58:35 +00:00
Eelco Dolstra
935042365c * Allow a netmask to be specified for each interface.
svn path=/nixos/trunk/; revision=8099
2007-02-28 14:19:20 +00:00
Eelco Dolstra
36d4802ea6 * Doesn't do anything.
svn path=/nixos/trunk/; revision=8091
2007-02-28 00:51:14 +00:00
Eelco Dolstra
52c9a6c756 svn path=/nixos/trunk/; revision=8078 2007-02-27 19:04:30 +00:00
Eelco Dolstra
a50097b9ca * Enable DRI support in the X server.
svn path=/nixos/trunk/; revision=8067
2007-02-27 00:31:04 +00:00
Eelco Dolstra
fdb5a06fa4 * Specify the resolution and the video driver name in the configuration file.
svn path=/nixos/trunk/; revision=8061
2007-02-26 23:11:32 +00:00
Eelco Dolstra
4164a4ff3e * Construct the module path dynamically.
svn path=/nixos/trunk/; revision=8059
2007-02-26 21:39:07 +00:00
Eelco Dolstra
ef92ce06cb * PAM file for chsh.
svn path=/nixos/trunk/; revision=8057
2007-02-26 21:18:13 +00:00
Eelco Dolstra
cc79d8f301 * Set the password hash to md5 for now - SLiM doesn't support
blowfish.  Of course, it should really use PAM.

svn path=/nixos/trunk/; revision=8046
2007-02-25 22:27:45 +00:00
Eelco Dolstra
ef6b45d924 * Start a display manager (SLiM).
svn path=/nixos/trunk/; revision=8045
2007-02-25 22:27:17 +00:00
Eelco Dolstra
426a8b806b * Use xinit to start the X server plus some initial clients (twm + xterm).
svn path=/nixos/trunk/; revision=8043
2007-02-25 16:20:14 +00:00
Eelco Dolstra
3ad2c91939 * Pure X server. All fonts are now in the Nix store.
svn path=/nixos/trunk/; revision=8041
2007-02-25 15:53:57 +00:00
Eelco Dolstra
0ee31b29ef * The daemon needs OpenSSH to be in the PATH for signing/verifying.
svn path=/nixos/trunk/; revision=8025
2007-02-22 18:04:18 +00:00
Eelco Dolstra
ed36857d5e * Don't start dhclient on interfaces that are explicitly configured.
svn path=/nixos/trunk/; revision=8014
2007-02-22 14:26:53 +00:00
Martin Bravenboer
8e6c1ba85d Support organization configuration for subversion
svn path=/nixos/trunk/; revision=8006
2007-02-22 10:55:58 +00:00
Eelco Dolstra
312e3d0e6b * Make ping setuid root.
svn path=/nixos/trunk/; revision=7970
2007-02-21 14:42:56 +00:00
Martin Bravenboer
e99ffcbe71 changed the extraSubservices to a list of functions
svn path=/nixos/trunk/; revision=7931
2007-02-20 15:57:15 +00:00
Martin Bravenboer
eeee6ea1e2 added configuration option for extraSubservices, which allows you to plugin an arbitrary service into the webserver.
svn path=/nixos/trunk/; revision=7926
2007-02-20 15:11:49 +00:00
Eelco Dolstra
619c3e0465 * Don't use the DHCP wrapper.
svn path=/nixos/trunk/; revision=7921
2007-02-20 14:20:33 +00:00
Eelco Dolstra
17cc5ecc47 * Add OpenSSH and pciutils to the boot environment.
svn path=/nixos/trunk/; revision=7918
2007-02-19 22:33:44 +00:00
Eelco Dolstra
06a6116c44 * Allow manual network configuration, i.e., specificying the IP
address, gateway, and nameservers in the system configuration.

svn path=/nixos/trunk/; revision=7898
2007-02-12 16:00:55 +00:00
Eelco Dolstra
d4c172469d * Add $profile/sbin to the PATH.
svn path=/nixos/trunk/; revision=7896
2007-02-12 15:29:43 +00:00
Eelco Dolstra
ac93023f35 * Pass userCreationDomain.
svn path=/nixos/trunk/; revision=7891
2007-02-12 11:57:18 +00:00
Eelco Dolstra
582abdaae2 * Option boot.copyKernels to copy all kernels and initrd to
/boot/kernels.  This is necessary if /nix is on a different file
  system than /.  (And it will allow us to support a separate /boot
  partition too.)

svn path=/nixos/trunk/; revision=7887
2007-02-09 16:19:29 +00:00
Eelco Dolstra
2f6810d4af svn path=/nixos/trunk/; revision=7878 2007-02-07 16:10:37 +00:00
Eelco Dolstra
8cf1eceb0a * Allow multiple file systems to be mounted in stage 1 (i.e., from the
initrd).  This is useful if /nix (which is necessary for stage 2) is
  on a different file system than /.

svn path=/nixos/trunk/; revision=7862
2007-02-06 16:53:36 +00:00
Eelco Dolstra
923348b490 * Provide a script "nixos-checkout" to replace the NixOS/Nixpkgs
sources in /etc/nixos with a Subversion checkout of those trees.
  This should be run after a successful installation if you want to
  keep NixOS up to date from Subversion.

svn path=/nixos/trunk/; revision=7859
2007-02-06 14:13:12 +00:00
Eelco Dolstra
42bcb9a2a7 * Recreate the /bin/sh symlink.
svn path=/nixos/trunk/; revision=7855
2007-02-06 13:15:52 +00:00
Eelco Dolstra
08ad51690d * Merge the test and upgrade scripts into a program "nixos-rebuild"
which is included in the system path.

svn path=/nixos/trunk/; revision=7853
2007-02-06 13:09:25 +00:00
Eelco Dolstra
25684805d5 * nixos-installer -> nixos-install.
svn path=/nixos/trunk/; revision=7852
2007-02-06 10:46:36 +00:00
Eelco Dolstra
6c4701f7cc * Quick hack to get scp to work again.
svn path=/nixos/trunk/; revision=7850
2007-02-06 10:17:13 +00:00
Eelco Dolstra
6fcd79d2ce * Merge the common-* files.
svn path=/nixos/trunk/; revision=7818
2007-01-30 15:03:43 +00:00
Eelco Dolstra
2c41edd1bc * Turn on pam_env for everything.
svn path=/nixos/trunk/; revision=7817
2007-01-30 14:58:04 +00:00
Eelco Dolstra
b0b776c04a * Add support for USB keyboards in stage 1.
svn path=/nixos/trunk/; revision=7811
2007-01-30 12:49:18 +00:00
Eelco Dolstra
b01ef92437 * Use pam_env to set the PATH for SSH logins. This allows
non-interactive ssh sessions (such as "ssh host command") to work
  properly.  This should probably be used for other kinds of logins as
  well.

svn path=/nixos/trunk/; revision=7799
2007-01-26 15:32:49 +00:00
Eelco Dolstra
995b749f70 * Put a nix-pull manifest of the Nix store on the CD.
svn path=/nixos/trunk/; revision=7777
2007-01-23 15:08:00 +00:00
Eelco Dolstra
d197a0f2cc * Use the Perl version of paths-from-graphs everywhere.
svn path=/nixos/trunk/; revision=7774
2007-01-23 14:37:42 +00:00
Eelco Dolstra
668c146e33 * Doh! Make sure that we put *only* splash_helper in the initrd and
not all of splashutils, otherwise we get Glibc in the initrd.

svn path=/nixos/trunk/; revision=7771
2007-01-23 13:44:41 +00:00
Eelco Dolstra
e3c5b9e752 svn path=/nixos/trunk/; revision=7767 2007-01-23 11:18:23 +00:00
Eelco Dolstra
8e0f2fd7c6 * Properly render DocBook in option descriptions.
svn path=/nixos/trunk/; revision=7765
2007-01-23 11:06:31 +00:00
Eelco Dolstra
5d883cbb85 * Flush the nscd hosts table after we've acquired an DHCP lease to
prevent problems with negative caching (NIXOS-45).

svn path=/nixos/trunk/; revision=7763
2007-01-23 10:22:00 +00:00
Eelco Dolstra
cdb98f8418 * Option to disable the splash screen in the initrd.
svn path=/nixos/trunk/; revision=7755
2007-01-22 18:58:04 +00:00
Eelco Dolstra
340ff5200a * Add a newline after each <dir>.
svn path=/nixos/trunk/; revision=7753
2007-01-22 17:17:53 +00:00
Eelco Dolstra
9c3a069326 * Add .../share/fonts to the font search path.
svn path=/nixos/trunk/; revision=7752
2007-01-22 17:17:43 +00:00
Eelco Dolstra
327cb83cf2 * Make it possible to turn off the generation of fonts.conf. This is
important for the installation CD, where we don't want a dependency
  on all those fonts.  Of course, it's quite nice that turning off the
  generation of a file automatically removes the dependencies on the
  files referenced by that file.

svn path=/nixos/trunk/; revision=7750
2007-01-22 16:42:29 +00:00
Eelco Dolstra
6cb01a0b22 * Use a small XSLT script that copies the original fonts.conf from the
fontconfig distribution, but replaces all <dir> entries with the
  directories specified in the $fontDirectories parameter.  This way
  we get all the font mapping rules from the original fonts.conf
  (e.g., aliases like "serif") and some other nice things.

svn path=/nixos/trunk/; revision=7749
2007-01-22 16:29:05 +00:00
Eelco Dolstra
eddd3a7e11 * Provide a few fonts in a purely functional way, i.e., as part of the
system configuration. 

svn path=/nixos/trunk/; revision=7748
2007-01-22 16:05:37 +00:00
Eelco Dolstra
6db2c1814e * Generate the list of fonts in a Nix expression.
svn path=/nixos/trunk/; revision=7744
2007-01-22 15:00:18 +00:00
Eelco Dolstra
ec3d2510c5 * Quick hack to enable fontconfig to find fonts. We look in the
default profile, in the user's profile, and in ~/.fonts.

svn path=/nixos/trunk/; revision=7709
2007-01-17 17:44:57 +00:00
Eelco Dolstra
02d3541a8b * Allow the time zone to be configured.
svn path=/nixos/trunk/; revision=7706
2007-01-17 12:33:23 +00:00
Eelco Dolstra
55e7f8f5dc * Use pam_xauth in su to pass the X cookies.
svn path=/nixos/trunk/; revision=7702
2007-01-16 22:25:28 +00:00
Eelco Dolstra
9866132d81 * Generate the LDAP configuration automatically.
svn path=/nixos/trunk/; revision=7698
2007-01-16 16:09:43 +00:00
Eelco Dolstra
07506308d6 * Support LDAP authentication.
* Factor out the common parts of the PAM config files.

svn path=/nixos/trunk/; revision=7694
2007-01-16 13:30:59 +00:00
Eelco Dolstra
554ae9908b * Some slightly hacky LDAP support. The problem is that Glibc has to
be able to find the LDAP NSS module, which is normally installed in
  Glibc's prefix (under /lib/libnss_ldap...).  Of course, we can't do
  that; it wouldn't be pure.  As a workaround, we simply add nss_ldap
  to the LD_LIBRARY_PATH of the nscd daemon, which every other program
  uses for lookups.  So we don't have to put nss_ldap in the
  LD_LIBRARY_PATH of every program.

svn path=/nixos/trunk/; revision=7684
2007-01-15 17:19:41 +00:00
Eelco Dolstra
af19b39a4b * Create wtmp, lastlog.
svn path=/nixos/trunk/; revision=7683
2007-01-15 17:16:49 +00:00
Eelco Dolstra
045d9fdc88 * Use /etc/profile into a separate file.
* Automatically set up a per-user profile in
  /nix/var/nix/profiles/per-user/$USER.
* Initialise ~/.nix-defexpr and ~/.nix-profile.

svn path=/nixos/trunk/; revision=7680
2007-01-15 14:43:56 +00:00
Eelco Dolstra
ee55c0048b * Fix filterSource calls.
svn path=/nixos/trunk/; revision=7669
2007-01-15 09:20:34 +00:00
Eelco Dolstra
d62029bc68 * Set ACLOCAL_PATH.
svn path=/nixos/trunk/; revision=7661
2007-01-14 16:15:51 +00:00
Eelco Dolstra
9963b263d3 * NSCD daemon.
svn path=/nixos/trunk/; revision=7645
2007-01-11 23:55:25 +00:00
Eelco Dolstra
5acc5f6e28 * Finally.
svn path=/nixos/trunk/; revision=7639
2007-01-11 16:53:44 +00:00
Eelco Dolstra
ebf72223a4 * Ugh.
svn path=/nixos/trunk/; revision=7638
2007-01-11 16:50:42 +00:00
Eelco Dolstra
e1b9efddcb * Slurp in ~/.bashrc from /etc/profile (just like SUSE).
* Set a nice prompt.

svn path=/nixos/trunk/; revision=7637
2007-01-11 16:42:18 +00:00
Eelco Dolstra
580f98f1ed * Make the set of setuid programs configurable.
* Make crontab setuid.

svn path=/nixos/trunk/; revision=7636
2007-01-11 16:29:23 +00:00
Eelco Dolstra
6b364875f9 * Enable setuid su.
svn path=/nixos/trunk/; revision=7634
2007-01-11 15:32:48 +00:00
Eelco Dolstra
daa8ecfe7a * Activate software RAID arrays.
svn path=/nixos/trunk/; revision=7631
2007-01-11 00:40:28 +00:00
Eelco Dolstra
c7c16f384a * Fixed some installer bugs.
svn path=/nixos/trunk/; revision=7629
2007-01-11 00:06:46 +00:00
Eelco Dolstra
158c303e2f * Enable SFTP support in sshd.
svn path=/nixos/trunk/; revision=7622
2007-01-10 17:19:17 +00:00
Eelco Dolstra
866d87c60b * Start the cron daemon.
svn path=/nixos/trunk/; revision=7621
2007-01-10 17:09:00 +00:00
Eelco Dolstra
774a0a397c * Allow the root device to be specified by label.
svn path=/nixos/trunk/; revision=7612
2007-01-10 14:07:10 +00:00
Eelco Dolstra
7ba1682c05 * In fileSystems: say label = "FOO"' instead of device = "LABEL=foo"'.
svn path=/nixos/trunk/; revision=7611
2007-01-10 13:58:48 +00:00
Eelco Dolstra
24e34612e3 * Allow swap devices to be specified by label.
svn path=/nixos/trunk/; revision=7609
2007-01-10 13:07:57 +00:00
Eelco Dolstra
cb10364838 * Use a diet udev in boot stage 1 to create the device nodes in /dev.
svn path=/nixos/trunk/; revision=7608
2007-01-10 12:42:28 +00:00
Eelco Dolstra
cbe4c2e0b8 * Installer: pull the manifest properly.
svn path=/nixos/trunk/; revision=7594
2007-01-09 21:19:06 +00:00
Eelco Dolstra
d4183887a8 * Add man to the initial path.
svn path=/nixos/trunk/; revision=7591
2007-01-09 17:27:26 +00:00
Eelco Dolstra
2148123b9c * Merge splash-themes.nix into the regular options infrastructure.
svn path=/nixos/trunk/; revision=7576
2007-01-08 22:41:41 +00:00
Eelco Dolstra
56da3e7887 * Allow any login program to be specified.
svn path=/nixos/trunk/; revision=7575
2007-01-08 21:34:30 +00:00
Eelco Dolstra
873a8de2ad * Don't emit ctrl-alt-delete.
svn path=/nixos/trunk/; revision=7574
2007-01-08 21:25:06 +00:00
Eelco Dolstra
b7f11ad98b * Generate sshd_config to set XAuthLocation if X11 forwarding is
enabled.

svn path=/nixos/trunk/; revision=7548
2007-01-07 10:19:16 +00:00
Eelco Dolstra
b6b5bafa22 * Refactoring.
svn path=/nixos/trunk/; revision=7533
2007-01-04 10:29:40 +00:00