Commit graph

540 commits

Author SHA1 Message Date
Eelco Dolstra ccbcf58062 * nvidiaDrivers -> nvidia_x11.
svn path=/nixos/trunk/; revision=14788
2009-03-30 14:54:22 +00:00
Eelco Dolstra b470feb916 * nixpkgsPath -> nixpkgs.
svn path=/nixos/trunk/; revision=14702
2009-03-25 15:47:29 +00:00
Wouter den Breejen 7eab893010 vsftpd userlist options added
svn path=/nixos/trunk/; revision=14650
2009-03-22 15:34:28 +00:00
Marc Weber aeba0af8dd Allow specifying [] as filesystem option
because you don't need any on vservers
You still get a warning when not setting the value so that you can't
forget it.

svn path=/nixos/branches/fix-style/; revision=14477
2009-03-09 19:18:27 +00:00
Marc Weber 321763dd84 Convert "ifplugd" (interfaceMonitor)
svn path=/nixos/branches/fix-style/; revision=14408
2009-03-06 12:27:50 +00:00
Marc Weber 8cad533a76 Convert "reboot/halt" events
svn path=/nixos/branches/fix-style/; revision=14407
2009-03-06 12:27:47 +00:00
Marc Weber 76f7978cc6 Convert "ctrl-alt-delete"
svn path=/nixos/branches/fix-style/; revision=14406
2009-03-06 12:27:45 +00:00
Marc Weber f76096bdf9 Convert "maintenance-shell"
svn path=/nixos/branches/fix-style/; revision=14405
2009-03-06 12:27:42 +00:00
Marc Weber 4a01e5afc8 Convert "sncd"
svn path=/nixos/branches/fix-style/; revision=14404
2009-03-06 12:27:40 +00:00
Marc Weber 4963abf63e Convert "nework-interfaces"
svn path=/nixos/branches/fix-style/; revision=14403
2009-03-06 12:27:38 +00:00
Marc Weber ed8bfc1c78 Convert "swap"
svn path=/nixos/branches/fix-style/; revision=14402
2009-03-06 12:27:35 +00:00
Marc Weber d964466c1a Convert "filesystems"
svn path=/nixos/branches/fix-style/; revision=14401
2009-03-06 12:27:33 +00:00
Marc Weber ea60090213 Convert "swraid"
svn path=/nixos/branches/fix-style/; revision=14400
2009-03-06 12:27:30 +00:00
Marc Weber f05cccbc66 Convert "lvm"
svn path=/nixos/branches/fix-style/; revision=14399
2009-03-06 12:27:28 +00:00
Marc Weber bfc722e83d Convert "klogd"
svn path=/nixos/branches/fix-style/; revision=14398
2009-03-06 12:27:23 +00:00
Marc Weber dd0f98fe22 added FIXME notes
svn path=/nixos/branches/fix-style/; revision=14397
2009-03-06 12:27:20 +00:00
Marc Weber 98ea167131 Convert "tty-backgrounds"
svn path=/nixos/branches/fix-style/; revision=14396
2009-03-06 12:27:18 +00:00
Marc Weber 3679813f37 Convert "mingetty"
svn path=/nixos/branches/fix-style/; revision=14395
2009-03-06 12:27:15 +00:00
Marc Weber c0ed553c87 Convert "bind"
svn path=/nixos/branches/fix-style/; revision=14394
2009-03-06 12:27:13 +00:00
Marc Weber a0b0bba762 Convert "dovecot"
svn path=/nixos/branches/fix-style/; revision=14393
2009-03-06 12:27:10 +00:00
Marc Weber 32ec389b15 Convert "postfix"
svn path=/nixos/branches/fix-style/; revision=14392
2009-03-06 12:27:07 +00:00
Marc Weber e5fd3f271e Convert "openfire" (problem with assertion)
svn path=/nixos/branches/fix-style/; revision=14391
2009-03-06 12:27:05 +00:00
Marc Weber 8e840a7aa4 Convert "postgresql"
svn path=/nixos/branches/fix-style/; revision=14390
2009-03-06 12:27:02 +00:00
Marc Weber 72303e9b6c Convert "mysql"
svn path=/nixos/branches/fix-style/; revision=14389
2009-03-06 12:27:00 +00:00
Marc Weber aa78690465 Convert "xfs", problems when enabling warning!
svn path=/nixos/branches/fix-style/; revision=14388
2009-03-06 12:26:57 +00:00
Marc Weber 030a30b4b6 Convert "irc-hybrid"
svn path=/nixos/branches/fix-style/; revision=14387
2009-03-06 12:26:55 +00:00
Marc Weber e6144b4763 Convert "samba"
svn path=/nixos/branches/fix-style/; revision=14386
2009-03-06 12:26:50 +00:00
Marc Weber e0240ddf3d Convert "udev"
svn path=/nixos/branches/fix-style/; revision=14385
2009-03-06 12:26:48 +00:00
Marc Weber d0733953e1 Convert "printing", CUPS daemon
svn path=/nixos/branches/fix-style/; revision=14384
2009-03-06 12:26:46 +00:00
Marc Weber 4d0761beb2 Convert "vsftpd"
svn path=/nixos/branches/fix-style/; revision=14383
2009-03-06 12:26:43 +00:00
Marc Weber e7b7d62777 Convert "httpd" and "apache-httpd"
svn path=/nixos/branches/fix-style/; revision=14382
2009-03-06 12:26:41 +00:00
Marc Weber eacbb7c38e Convert "tomcat"
svn path=/nixos/branches/fix-style/; revision=14380
2009-03-06 12:26:34 +00:00
Marc Weber b17f9995d5 Convert "jboss" (untested)
svn path=/nixos/branches/fix-style/; revision=14379
2009-03-06 12:26:31 +00:00
Marc Weber 0c7129316c Convert "ejabbered" (untested)
svn path=/nixos/branches/fix-style/; revision=14378
2009-03-06 12:26:29 +00:00
Marc Weber 931f68c924 Convert "gnunet"
svn path=/nixos/branches/fix-style/; revision=14377
2009-03-06 12:26:26 +00:00
Marc Weber f9f61c0a1e Convert "bitlbee"
svn path=/nixos/branches/fix-style/; revision=14376
2009-03-06 12:26:24 +00:00
Marc Weber adafcb8f32 Convert "portmap"
svn path=/nixos/branches/fix-style/; revision=14375
2009-03-06 12:26:22 +00:00
Marc Weber 2e93c3cdb9 Convert "ntp" daemon
svn path=/nixos/branches/fix-style/; revision=14374
2009-03-06 12:26:19 +00:00
Marc Weber b5f963bb8b use cat again to create users instead of << "..."
this way '`" doesn't have to be escaped (used by avahi)

svn path=/nixos/branches/fix-style/; revision=14373
2009-03-06 12:26:16 +00:00
Marc Weber 7b0071781d Convert "lshd" GNU ssh daemon
svn path=/nixos/branches/fix-style/; revision=14371
2009-03-06 12:26:10 +00:00
Marc Weber d285fea2da Convert "sshd" daemon
Should the client config in etc/default.nix be moved as wel?

svn path=/nixos/branches/fix-style/; revision=14370
2009-03-06 12:26:08 +00:00
Marc Weber 4768fd6488 Convert "dhcpd" daemon
svn path=/nixos/branches/fix-style/; revision=14369
2009-03-06 12:26:05 +00:00
Marc Weber e52ada51a4 commment
svn path=/nixos/branches/fix-style/; revision=14368
2009-03-06 12:26:01 +00:00
Marc Weber 29cca0f34c Convert "syslogd"
svn path=/nixos/branches/fix-style/; revision=14367
2009-03-06 12:25:57 +00:00
Marc Weber 8a8d387b22 Convert "installer"
svn path=/nixos/branches/fix-style/; revision=14366
2009-03-06 12:25:53 +00:00
Marc Weber 819873d745 Convert "nix-daemon" and nix options
svn path=/nixos/branches/fix-style/; revision=14365
2009-03-06 12:25:51 +00:00
Marc Weber 028b515a6e Convert "gw6c" and its security options (untested)
svn path=/nixos/branches/fix-style/; revision=14364
2009-03-06 12:25:48 +00:00
Marc Weber f889d6215e Convert "nixos security options"
svn path=/nixos/branches/fix-style/; revision=14363
2009-03-06 12:25:46 +00:00
Marc Weber b5a7c767c5 Convert "ldap" (untested)
svn path=/nixos/branches/fix-style/; revision=14362
2009-03-06 12:25:44 +00:00
Marc Weber bca405ae44 Convert "kbd" (i18n)
svn path=/nixos/branches/fix-style/; revision=14361
2009-03-06 12:25:38 +00:00
Marc Weber a86ae923d7 Convert "nixos-environment"
in particular: (override) nix, extraPackages, checkConfigurationOptions

svn path=/nixos/branches/fix-style/; revision=14360
2009-03-06 12:25:35 +00:00
Marc Weber e344a2d055 Convert "unix-odbc-drivers"
svn path=/nixos/branches/fix-style/; revision=14359
2009-03-06 12:25:33 +00:00
Marc Weber 1c43b4946b Convert "acpid"
svn path=/nixos/branches/fix-style/; revision=14358
2009-03-06 12:25:25 +00:00
Marc Weber 8c5f0522e7 removed new proposal jobs
the fix-style branch makes them obsolete
It was broken anyway. I'll readd synergy (client, server) jobs again
later

svn path=/nixos/branches/fix-style/; revision=14353
2009-03-05 17:11:40 +00:00
Lluís Batlle i Rossell 632d77806f Fixing vsftpd without anonymous users, adding localUsers, and creating chroot path.
svn path=/nixos/trunk/; revision=14286
2009-02-28 20:01:49 +00:00
Ludovic Courtès d1f57d6e1b Convert `portmap' Upstart job to the "new" style.
svn path=/nixos/trunk/; revision=14232
2009-02-24 19:17:25 +00:00
Nicolas Pierron 1c66b3e0c0 Fix activation script's merge function.
svn path=/nixos/branches/fix-style/; revision=14199
2009-02-22 23:33:58 +00:00
Nicolas Pierron 357ca60ed7 * Set KDEDIRS, XDG_CONFIG_DIRS and XDG_DATA_DIRS in bashrc. This has
the advantage that KDE applications work when logging in via ssh,
  and that you don't need to logout to have KDE upgrades take effect.
  On the downside, since the various KDE packages and shared-mime-info
  all have their own MIME databases, if we put them in one symlink
  tree (systemPath), we need to rerun update-mime-database on the
  symlink tree.  Also, systemPath is getting very large.

svn path=/nixos/branches/fix-style/; revision=14191
2009-02-22 16:09:14 +00:00
Nicolas Pierron 86f5d9dace added hint about how to get the swap partion kernel node numbers
svn path=/nixos/branches/fix-style/; revision=14184
2009-02-22 16:08:41 +00:00
Nicolas Pierron 094aee7467 * acpid: switch to the ondemand CPU scaling governer when on battery power.
Disabled acpid by default because it's not configurable enough yet.

svn path=/nixos/branches/fix-style/; revision=14182
2009-02-22 16:08:33 +00:00
Nicolas Pierron 0c6afe1dd2 Add Upstart job for PulseAudio as a system-wide daemon.
svn path=/nixos/branches/fix-style/; revision=14171
2009-02-22 16:07:42 +00:00
Nicolas Pierron 41b1b80d9e * Quick hack to make the `info' command work properly by generating
a "dir" file on the fly in a wrapper script.

svn path=/nixos/branches/fix-style/; revision=14164
2009-02-22 16:07:10 +00:00
Nicolas Pierron d5f3418507 Added guestUsers job for automatical adding guests
svn path=/nixos/branches/fix-style/; revision=14160
2009-02-22 16:06:52 +00:00
Nicolas Pierron f824a1e753 Added rogue job used by CD
svn path=/nixos/branches/fix-style/; revision=14159
2009-02-22 16:06:47 +00:00
Nicolas Pierron b1eabe2b1b An upstart job to display manual
svn path=/nixos/branches/fix-style/; revision=14158
2009-02-22 16:06:42 +00:00
Nicolas Pierron 95ef8b1694 Option for proxy usage in Nix daemon
Signed-off-by: Nicolas Pierron <nicolas.pierron@lrde.epita.fr>

svn path=/nixos/branches/fix-style/; revision=14156
2009-02-22 16:06:27 +00:00
Eelco Dolstra 311ff6c8e7 * Set KDEDIRS, XDG_CONFIG_DIRS and XDG_DATA_DIRS in bashrc. This has
the advantage that KDE applications work when logging in via ssh,
  and that you don't need to logout to have KDE upgrades take effect.
  On the downside, since the various KDE packages and shared-mime-info
  all have their own MIME databases, if we put them in one symlink
  tree (systemPath), we need to rerun update-mime-database on the
  symlink tree.  Also, systemPath is getting very large.

svn path=/nixos/trunk/; revision=14148
2009-02-20 16:31:42 +00:00
Marc Weber bcba001e37 added hint about how to get the swap partion kernel node numbers
svn path=/nixos/trunk/; revision=14081
2009-02-13 19:01:13 +00:00
Eelco Dolstra 03e7f296b1 * acpid: switch to the ondemand CPU scaling governer when on battery power.
Disabled acpid by default because it's not configurable enough yet.

svn path=/nixos/trunk/; revision=14070
2009-02-13 12:11:42 +00:00
Ludovic Courtès 2b8216bdda Add Upstart job for PulseAudio as a system-wide daemon.
svn path=/nixos/trunk/; revision=13907
2009-01-29 18:28:09 +00:00
Nicolas Pierron c3f848e2d6 Remove name arguments from obsolete options.
svn path=/nixos/trunk/; revision=13864
2009-01-25 20:47:30 +00:00
Nicolas Pierron 639be32a8a Remove obsolete notation. (backwardPkgsFun*)
svn path=/nixos/branches/fix-style/; revision=13858
2009-01-25 15:49:12 +00:00
Nicolas Pierron b2b6f92d6b Split xserver upstart job into:
- xserver configuration & job
- display manager (slim)
- window manager (compiz, kwm, metacity, twm, wmii, xmonad)
- desktop manager (kde, gnome, xterm)

Added features:
- Add WM choice in slim (with F1)

svn path=/nixos/branches/fix-style/; revision=13857
2009-01-25 15:49:08 +00:00
Nicolas Pierron fa3437cb35 Remove enableIntel* and enableGo7007 options.
Update nixos-hardware-scan.pl to generate files without these options.

svn path=/nixos/branches/fix-style/; revision=13856
2009-01-25 15:48:59 +00:00
Nicolas Pierron 6086aee542 * The Linux kernel >= 2.6.27 provides firmware, so add it to the
firmware search path.

(Patch from Eelco Dolstra)

svn path=/nixos/branches/fix-style/; revision=13855
2009-01-25 15:48:53 +00:00
Nicolas Pierron 9cdfe5a711 Extract kernel configuration from options.nix.
svn path=/nixos/branches/fix-style/; revision=13854
2009-01-25 15:48:48 +00:00
Nicolas Pierron 9fa758c657 Update the function used to merge option sets.
svn path=/nixos/branches/fix-style/; revision=13853
2009-01-25 15:48:43 +00:00
Nicolas Pierron bb56774a54 Fix hostname (inverse test).
svn path=/nixos/branches/fix-style/; revision=13851
2009-01-25 15:48:35 +00:00
Nicolas Pierron 348afe7dc6 Replace old argument syntax.
svn path=/nixos/trunk/; revision=13848
2009-01-25 15:26:46 +00:00
Eelco Dolstra d532df65dd * Quick hack to make the `info' command work properly by generating
a "dir" file on the fly in a wrapper script.

svn path=/nixos/trunk/; revision=13805
2009-01-19 12:34:14 +00:00
Michael Raskin 12f4fbfb4b Added guestUsers job for automatical adding guests
svn path=/nixos/trunk/; revision=13732
2009-01-09 00:23:07 +00:00
Michael Raskin 9a46e71e7b Added rogue job used by CD
svn path=/nixos/trunk/; revision=13730
2009-01-08 23:49:22 +00:00
Michael Raskin 0a1f41c742 An upstart job to display manual
svn path=/nixos/trunk/; revision=13728
2009-01-08 23:30:23 +00:00
Michael Raskin 32adf2c521 Option for proxy usage in Nix daemon
svn path=/nixos/trunk/; revision=13689
2009-01-03 09:07:52 +00:00
Nicolas Pierron 7aa27dfee2 Merge branches 'fix-style' and 'master' into fix-style
svn path=/nixos/branches/fix-style/; revision=13688
2009-01-02 19:41:39 +00:00
Nicolas Pierron d745c21aab Merge system/fontdir.nix and system/fonts.nix into a new configuration file.
svn path=/nixos/branches/fix-style/; revision=13686
2009-01-02 16:07:39 +00:00
Nicolas Pierron e4b0134a43 Add a grub configuration file.
svn path=/nixos/branches/fix-style/; revision=13685
2009-01-02 16:07:34 +00:00
Nicolas Pierron b67e2a12aa Convert "boot/boot-stage-2.nix" to a configuration file.
svn path=/nixos/branches/fix-style/; revision=13684
2009-01-02 16:07:30 +00:00
Nicolas Pierron 7cdb7d38ef Replace the activation script by one which is completely generated.
svn path=/nixos/branches/fix-style/; revision=13683
2009-01-02 16:07:24 +00:00
Nicolas Pierron 1b32260084 Convert "upstart-jobs/xserver.nix" to a configuration file.
svn path=/nixos/branches/fix-style/; revision=13682
2009-01-02 16:07:21 +00:00
Nicolas Pierron 44f1d9f0bf Extra sudo configuration file from:
- system/options.nix
- system/system.nix
- etc/default.nix

svn path=/nixos/branches/fix-style/; revision=13681
2009-01-02 16:07:15 +00:00
Nicolas Pierron 79bfab0e07 convert "upstart-jobs/atd.nix" to a configuration file. Remove extra occurrences of "atd" from other files.
svn path=/nixos/branches/fix-style/; revision=13680
2009-01-02 16:07:10 +00:00
Nicolas Pierron 86ad3e36d5 Move Nix setup from system/active-configuration.sh to system/system-options.nix.
svn path=/nixos/branches/fix-style/; revision=13679
2009-01-02 16:07:05 +00:00
Nicolas Pierron 145345c307 system/users-groups.nix is now a configuration file.
Remove user & group references from system/system.nix.

svn path=/nixos/branches/fix-style/; revision=13678
2009-01-02 16:07:01 +00:00
Nicolas Pierron 8d5553a4d5 move some command to activate the configuration from activate-configuration.sh to system-options.nix.
svn path=/nixos/branches/fix-style/; revision=13677
2009-01-02 16:06:56 +00:00
Nicolas Pierron 1533dec09d * etc/default.nix is now a configuration file.
* the script used to build the etc directory in stored in config.system.build.etc.
* The activation script is defined inside etc/Default.nix instead of system/activate-configuration.sh

svn path=/nixos/branches/fix-style/; revision=13676
2009-01-02 16:06:52 +00:00
Nicolas Pierron e7e45dbd2c Start moving the "activate configuration" script to be extensible.
svn path=/nixos/branches/fix-style/; revision=13675
2009-01-02 16:06:46 +00:00
Michael Raskin d8c1734b99 Synaptics two-finger scrolling option
svn path=/nixos/trunk/; revision=13663
2008-12-20 14:29:52 +00:00
Eelco Dolstra 43dc3f6baa * Fix grammar/spelling for some descriptions, and make them produce
well-formed XML in the manual again.

svn path=/nixos/trunk/; revision=13650
2008-12-17 13:06:48 +00:00
Eelco Dolstra c155a3f46e * When doing chroot builds, the `build-chroot-dirs' option should
include the closure of /bin/sh.  Otherwise all builders that call
  /bin/sh will fail when using the new chroot implementation, which
  only bind-mounts the inputs of a build rather than the whole Nix
  store.

svn path=/nixos/trunk/; revision=13640
2008-12-15 23:54:10 +00:00