Commit graph

208 commits

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