Commit Graph

411 Commits

Author SHA1 Message Date
Marc Weber
bca405ae44 Convert "kbd" (i18n)
svn path=/nixos/branches/fix-style/; revision=14361
2009-03-06 12:25:38 +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
Nicolas Pierron
a3b91410cd Fix kde4 configuration.
svn path=/nixos/branches/fix-style/; revision=14198
2009-02-22 23:33:53 +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
fd08470a26 * Quick hack to make sure that acpid starts before hal.
svn path=/nixos/branches/fix-style/; revision=14190
2009-02-22 16:09:07 +00:00
Nicolas Pierron
e79dbaad55 * Support for KDE 4.2. Set services.xserver.desktopManager.kde4.enable to
true to enable.  It looks great ;-)

svn path=/nixos/branches/fix-style/; revision=14185
2009-02-22 16:08:46 +00:00
Nicolas Pierron
802d4f02c4 * Generate the acpid configuration properly: each config file
can only contain one event.

svn path=/nixos/branches/fix-style/; revision=14183
2009-02-22 16:08:37 +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
be4a0494b8 * Suspend when the laptop lid is closed.
svn path=/nixos/branches/fix-style/; revision=14181
2009-02-22 16:08:28 +00:00
Nicolas Pierron
128699688a * Run the ACPI daemon. This allows the system to respond to ACPI
events, like pressing the power button.  The NVIDIA X11 driver also
  needs it to respond to the internal/external monitor switch button
  on laptops.  The power actions should of course be made
  configurable.

svn path=/nixos/branches/fix-style/; revision=14180
2009-02-22 16:08:22 +00:00
Nicolas Pierron
840dac3fec Making the 'via' video module available in the xserver upstart-job.
svn path=/nixos/branches/fix-style/; revision=14176
2009-02-22 16:08:05 +00:00
Nicolas Pierron
09bcf1418c * Start mingetty after udev, otherwise /dev/tty* may not exist yet
(and you get Upstart messages about the ttyN job being restarted).

svn path=/nixos/branches/fix-style/; revision=14174
2009-02-22 16:07:56 +00:00
Nicolas Pierron
d92d0e98f4 PulseAudio Upstart job: honor `enable'.
svn path=/nixos/branches/fix-style/; revision=14173
2009-02-22 16:07:52 +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
0addac3473 * CUPS: use /etc/cups rather than ${cups}/etc/cups as the ServerRoot,
because CUPS modifies files in the ServerRoot directory.  Most
  importantly, it stores printer configuration there.  Previously the
  CUPS server modified the files under ${cups}/etc/cups, which is
  impure and caused all configured printers to disappear any time CUPS
  was upgraded.

svn path=/nixos/branches/fix-style/; revision=14169
2009-02-22 16:07:33 +00:00
Nicolas Pierron
38aac77669 Increased the sleep hack on the Tomcat service
svn path=/nixos/branches/fix-style/; revision=14168
2009-02-22 16:07:29 +00:00
Nicolas Pierron
77db653dfe Some fixes to the Apache Tomcat connector
svn path=/nixos/branches/fix-style/; revision=14167
2009-02-22 16:07:25 +00:00
Nicolas Pierron
08a18fc863 Update argument syntax of configuration files.
svn path=/nixos/branches/fix-style/; revision=14166
2009-02-22 16:07:21 +00:00
Nicolas Pierron
6b1307c6f1 * Remove a stale lock file that may prevent the
X server from starting.

svn path=/nixos/branches/fix-style/; revision=14165
2009-02-22 16:07:16 +00:00
Nicolas Pierron
33445eb221 * CUPS daemon: modprobe usblp so that CUPS can find USB printers.
* CUPS daemon: use Ghostscript to support printing on non-Postscript
  printers.

svn path=/nixos/branches/fix-style/; revision=14163
2009-02-22 16:07:05 +00:00
Nicolas Pierron
46f1cab80f Added Apache Tomcat proxy to new Apache upstart service
svn path=/nixos/branches/fix-style/; revision=14162
2009-02-22 16:07:01 +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
ecc761543c Remove name argument of merge functions.
svn path=/nixos/branches/fix-style/; revision=13860
2009-01-25 15:49:23 +00:00
Nicolas Pierron
dcc981840e Use the mergeOneOption function instead of duplicated code.
svn path=/nixos/branches/fix-style/; revision=13859
2009-01-25 15:49:18 +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
67edd3720f Update argument syntax of configuration files.
svn path=/nixos/branches/fix-style/; revision=13852
2009-01-25 15:48:39 +00:00
Nicolas Pierron
08280c415f Add support for wmii.
svn path=/nixos/branches/fix-style/; revision=13850
2009-01-25 15:48:30 +00:00
Nicolas Pierron
b92036e803 Fetch the windows manager pid.
svn path=/nixos/branches/fix-style/; revision=13849
2009-01-25 15:48:25 +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
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
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
c787cb1a0a Replace job tags by a library of function to build upstart jobs.
svn path=/nixos/branches/fix-style/; revision=13674
2009-01-02 16:06:41 +00:00
Nicolas Pierron
b47e6675b8 Use generated upstart-job's tags for cron.
svn path=/nixos/branches/fix-style/; revision=13593
2008-12-07 12:27:46 +00:00
Nicolas Pierron
2f0e8e370a Update argument style.
svn path=/nixos/branches/fix-style/; revision=13584
2008-12-04 15:48:27 +00:00
Nicolas Pierron
1236cf61f4 replace ifEnable by mkIf and mkThenElse.
svn path=/nixos/branches/fix-style/; revision=13382
2008-11-23 01:29:25 +00:00
Nicolas Pierron
157bb2b71a Convert "alsa" upstart-job to the fix-style.
svn path=/nixos/branches/fix-style/; revision=13379
2008-11-23 01:29:05 +00:00
Nicolas Pierron
9c0eef3bae Convert "dbus" & "avahi-deamon" upstart-job to the fix-style.
svn path=/nixos/branches/fix-style/; revision=13378
2008-11-23 01:28:58 +00:00
Nicolas Pierron
dc634f5297 Convert "hal" upstart-job to the fix-style.
svn path=/nixos/branches/fix-style/; revision=13377
2008-11-23 01:28:52 +00:00
Nicolas Pierron
585fd9d911 Convert "gpm" upstart-job to the fix-style.
svn path=/nixos/branches/fix-style/; revision=13376
2008-11-23 01:28:45 +00:00
Nicolas Pierron
afe160c6b2 Convert "nagios" upstart-job to the fix-style.
svn path=/nixos/branches/fix-style/; revision=13375
2008-11-23 01:28:34 +00:00
Nicolas Pierron
a63ea50ee9 Fix zabbix-server.nix.
svn path=/nixos/branches/fix-style/; revision=13374
2008-11-23 01:28:25 +00:00
Nicolas Pierron
9c751d377d Use the new scheme for zabbix upstart-job.
svn path=/nixos/branches/fix-style/; revision=13329
2008-11-18 18:00:21 +00:00
Nicolas Pierron
3a25babf1b Use the new scheme for disnix upstart-job.
svn path=/nixos/branches/fix-style/; revision=13328
2008-11-18 18:00:15 +00:00
Nicolas Pierron
892d12bccf - Move some system configuration to options:
* system.nssModules
  * system.modulesTree
  * system.sbin.modprobe
  * system.sbin.mount
  * nix.envVars

- Remove Arguments that can be accessed either by "config" or "pkgs".

- Use the new scheme for upstart-jobs/default.nix.
This is now a configuration file which is imported by system/options.nix.

- Jobs can now include upstart-job/default.nix:
  * upstrat-jobs/cron.nix
  * upstart-jobs/dhclient.nix

=> No Nixos file refers to upstart-jobs/default.nix except if one of its options is require to define an extra job. (e.g.: cron, dhclient)

svn path=/nixos/branches/fix-style/; revision=13327
2008-11-18 18:00:09 +00:00