Commit graph

226 commits

Author SHA1 Message Date
Michael Raskin
4892139b38 Added ATI card support to xserver.conf
svn path=/nixos/trunk/; revision=9951
2007-12-18 22:43:17 +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
Michael Raskin
3ba09e4004 Changed Postgresql upstart job not to stop on network down
svn path=/nixos/trunk/; revision=9867
2007-12-06 03:50:15 +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
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
524f1fa376 svn path=/nixos/trunk/; revision=9756 2007-11-19 15:50:26 +00:00
Eelco Dolstra
4de273e376 * Set the To: field.
* Doh! copy the actual Nagios config files to the store, 
  not symlinks to the sources outside of the store.

svn path=/nixos/trunk/; revision=9755
2007-11-19 15:50:02 +00:00
Eelco Dolstra
d53c726cbb * Make the Nagios configuration visible in /etc/nagios.cfg.
svn path=/nixos/trunk/; revision=9753
2007-11-19 15:31:28 +00:00
Marc Weber
bb08b8ff48 ; bug fix
svn path=/nixos/trunk/; revision=9701
2007-11-15 23:57:20 +00:00
Marc Weber
d7eb1006bb added driver nv as suggested by niksnut
svn path=/nixos/trunk/; revision=9700
2007-11-15 23:52:53 +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
Wouter den Breejen
14c2bb437d svn path=/nixos/trunk/; revision=9665 2007-11-13 16:38:39 +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
2fc94b76fe * Eliminate all calls to config.get.
svn path=/nixos/trunk/; revision=9619
2007-11-09 18:49:45 +00:00
Michael Raskin
c4ad7b56d1 Added a silent mention of evdev in xorg.conf, but removed actual dependency on it.
svn path=/nixos/trunk/; revision=9614
2007-11-09 13:55:07 +00:00
Eelco Dolstra
e6b8dd5b25 * Cleanup.
svn path=/nixos/trunk/; revision=9593
2007-11-06 00:00:29 +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
Wouter den Breejen
f7fd4c9a6d Fixed ../ to ../../services reference
svn path=/nixos/trunk/; revision=9552
2007-10-29 14:24:24 +00:00
Michael Raskin
a357a601bf Enable composite extension for i810.
svn path=/nixos/trunk/; revision=9541
2007-10-27 17:47:54 +00:00
Wouter den Breejen
8881c10ca4 Dont let the 'normal' fsck check a ext3cow partitions anymore since it thinks it fixes inodes but it will actually cause ext3cow to loose data .....
svn path=/nixos/trunk/; revision=9537
2007-10-27 13:04:00 +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
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
Eelco Dolstra
48acdef3c9 * Use the stdenv that does support \n in replacements.
svn path=/nixos/trunk/; revision=9399
2007-10-03 14:48:41 +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
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
Marc Weber
53a8d28f06 added udev rule to move /dev/tun to the place /dev/net/tun which most distros are using by default as well as tunctl
svn path=/nixos/trunk/; revision=9252
2007-09-04 13:44:26 +00:00
Yury G. Kudryashov
0c4a936419 Added .xsession support
If user have ~/.xsession file it will be sourced.

svn path=/nixos/trunk/; revision=9231
2007-09-01 17:57:04 +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
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
Michael Raskin
45c9f350b1 Corrected ircd-hybrid to fix the problem with finishing terminal-keeping thread.
svn path=/nixos/trunk/; revision=9107
2007-08-13 10:45:16 +00:00
Michael Raskin
db3e598ba9 Corrected IRCD.
svn path=/nixos/trunk/; revision=9103
2007-08-11 21:48:08 +00:00
Michael Raskin
02c3fc72d8 Made ircd-hybrid wait gw6c coming up if it is enabled at all.
svn path=/nixos/trunk/; revision=9096
2007-08-10 18:52:35 +00:00
Eelco Dolstra
9cb4834270 * Add the default profile and the user's profile to $KDEDIRS.
This is necessary for some KDE applications.

svn path=/nixos/trunk/; revision=9087
2007-08-09 19:59:48 +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
Michael Raskin
8843f3c287 Corrected dependencies for gw6c; also made httpd depend on gw6c if needed.
svn path=/nixos/trunk/; revision=9029
2007-08-02 21:26:38 +00:00
Eelco Dolstra
333d0dfe17 * Forward udev events to HAL.
svn path=/nixos/trunk/; revision=9016
2007-07-22 02:07:02 +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
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
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
ea9e6bdbac * Re-enable some essential X server modules (in particular
extmod, which contains XVideo).

svn path=/nixos/trunk/; revision=8857
2007-06-09 21:12:48 +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
02514fc802 * /var/state -> /var/run.
svn path=/nixos/trunk/; revision=8852
2007-06-09 19:46:57 +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
Eelco Dolstra
c76fa154a6 * Fix the xserver job on non-nvidia cards.
svn path=/nixos/trunk/; revision=8800
2007-05-29 19:53:03 +00:00
Wouter den Breejen
f8d77aa58e samba fix and xserver cleanup
svn path=/nixos/trunk/; revision=8791
2007-05-28 15:39:25 +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
bec6f8a516 * Ignore modprobe errors.
svn path=/nixos/trunk/; revision=8713
2007-05-16 19:43:28 +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
719112e7bb * Add ~/bin to the PATH.
svn path=/nixos/trunk/; revision=8557
2007-04-10 14:18:15 +00:00
Eelco Dolstra
6113da3ce1 * Set the permissions of /dev/fuse to 0666.
svn path=/nixos/trunk/; revision=8547
2007-04-07 21:41:29 +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
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
3e71bd9731 * Quick hack to prevent the udev job from messing up the device
ownership of logged-in users.

svn path=/nixos/trunk/; revision=8530
2007-04-02 15:00:31 +00:00
Eelco Dolstra
3f65f9ee55 * tty-backgrounds: declare /etc/splash properly.
svn path=/nixos/trunk/; revision=8507
2007-03-30 13:08:01 +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
5cf236ba04 * Thsi shouldn't be here.
svn path=/nixos/trunk/; revision=8504
2007-03-30 12:54:42 +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
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
8447e036fd * Create dhcpd.leases, otherwise dhcpd won't start.
svn path=/nixos/trunk/; revision=8380
2007-03-20 12:34:52 +00:00
Eelco Dolstra
4f3b2290b2 * FHS compliance: put persistent state in /var/lib, not /var/state.
svn path=/nixos/trunk/; revision=8377
2007-03-20 11:04: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
1ca3258c3f * More failure tolerance.
svn path=/nixos/trunk/; revision=8303
2007-03-16 14:46:56 +00:00
Eelco Dolstra
b670a6d3d8 * Disable the zoom plugin.
svn path=/nixos/trunk/; revision=8277
2007-03-13 11:34:52 +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
ba845b19fb * Doh.
svn path=/nixos/trunk/; revision=8170
2007-03-04 21:25:32 +00:00
Eelco Dolstra
5ea2541f05 * Put compiz plugins in the right order.
svn path=/nixos/trunk/; revision=8169
2007-03-04 13:15:30 +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
fb2a9d91a1 * Make sure the stop script gets executed on shutdown.
svn path=/nixos/trunk/; revision=8126
2007-03-01 00:50:17 +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
f948c10999 * Enable compositing in the X server.
svn path=/nixos/trunk/; revision=8118
2007-02-28 22:59:39 +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
94393dbd20 * Create /var/state/opengl-driver.
svn path=/nixos/trunk/; revision=8069
2007-02-27 00:50:22 +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
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