Commit graph

21 commits

Author SHA1 Message Date
Marc Weber fb1e6d5c80 * Synced with trunk @ 15345
svn path=/nixos/branches/modular-nixos/; revision=15372
2009-04-28 13:49:05 +00:00
Marc Weber cc7f5eba97 * Synced with trunk @ 15326
svn path=/nixos/branches/modular-nixos/; revision=15366
2009-04-28 13:40:55 +00:00
Marc Weber bb2de6da2e * Synced with trunk @ 15208
svn path=/nixos/branches/modular-nixos/; revision=15362
2009-04-28 13:33:52 +00:00
Marc Weber a9360de947 * Synced with trunk @ 15204
svn path=/nixos/branches/modular-nixos/; revision=15361
2009-04-28 13:32:37 +00:00
Nicolas Pierron 98eda94473 KDM: Add support for extra window & desktop manager.
svn path=/nixos/branches/modular-nixos/; revision=15011
2009-04-13 10:57:36 +00:00
Nicolas Pierron b1e05ed8fa * Synced with trunk @ 14913
svn path=/nixos/branches/modular-nixos/; revision=15010
2009-04-13 10:55:41 +00:00
Nicolas Pierron 0ff58754ae Move slim options into the displayManager attribute set.
Add an enable flag to slim which is by default set to be true.

svn path=/nixos/branches/modular-nixos/; revision=15009
2009-04-13 10:47:15 +00:00
Nicolas Pierron 3a8ef07934 Add wmii package in the environment if wmii WM is enabled.
svn path=/nixos/branches/modular-nixos/; revision=14991
2009-04-11 22:28:38 +00:00
Nicolas Pierron 33a0873f6f Add error messages to detect if the default (not override by the user) WM/DM is enable.
Enable xterm desktop manager.

svn path=/nixos/branches/modular-nixos/; revision=14990
2009-04-11 22:28:33 +00:00
Nicolas Pierron 23c03c3f46 Fix typo in kdeEnvironment.
svn path=/nixos/branches/modular-nixos/; revision=14987
2009-04-11 22:17:01 +00:00
Nicolas Pierron 16a916f297 * Synced with trunk @ 14905
svn path=/nixos/branches/modular-nixos/; revision=14986
2009-04-11 22:12:02 +00:00
Nicolas Pierron 3f1dd56e9e * Synced with trunk @ 14801
svn path=/nixos/branches/modular-nixos/; revision=14953
2009-04-08 14:01:16 +00:00
Nicolas Pierron 9ba1f01479 * Synced with trunk @ 14413
svn path=/nixos/branches/modular-nixos/; revision=14951
2009-04-08 13:50:32 +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 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 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 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 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