Commit graph

259 commits

Author SHA1 Message Date
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