Author: eelco
Date: Sun Aug 8 22:45:54 2010
New Revision: 23048
URL: https://svn.nixos.org/websvn/nix/?rev=23048&sc=1
Log:
* Start of an Xfce desktop manager module. Currently it just starts
Xfwm and Terminal.
Added:
nixos/trunk/modules/services/x11/desktop-managers/xfce.nix
Modified:
nixos/trunk/modules/services/x11/desktop-managers/default.nix
nixos/trunk/modules/services/x11/desktop-managers/kde4.nix
Modified: nixos/trunk/modules/services/x11/desktop-managers/default.nix
==============================================================================
--- nixos/trunk/modules/services/x11/desktop-managers/default.nix Sun Aug
8 22:43:00 2010 (r23047)
+++ nixos/trunk/modules/services/x11/desktop-managers/default.nix Sun Aug
8 22:45:54 2010 (r23048)
@@ -17,7 +17,7 @@
# Note: the order in which desktop manager modules are imported here
# determines the default: later modules (if enabled) are preferred.
# E.g., if KDE is enabled, it supersedes xterm.
- imports = [ ./none.nix ./xterm.nix ./gnome.nix ./kde4.nix ];
+ imports = [ ./none.nix ./xterm.nix ./xfce.nix ./gnome.nix ./kde4.nix ];
options = {
Modified: nixos/trunk/modules/services/x11/desktop-managers/kde4.nix
==============================================================================
--- nixos/trunk/modules/services/x11/desktop-managers/kde4.nix Sun Aug 8
22:43:00 2010 (r23047)
+++ nixos/trunk/modules/services/x11/desktop-managers/kde4.nix Sun Aug 8
22:45:54 2010 (r23048)
@@ -23,8 +23,7 @@
default = [];
example = [ pkgs.kde4.digikam ];
type = types.list types.package;
- description = "Additional KDE 4 programs. Only minimal set is installed
by
- default.";
+ description = "Additional KDE 4 programs. Only a minimal set is
installed by default.";
};
};
Added: nixos/trunk/modules/services/x11/desktop-managers/xfce.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixos/trunk/modules/services/x11/desktop-managers/xfce.nix Sun Aug 8
22:45:54 2010 (r23048)
@@ -0,0 +1,43 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+ xcfg = config.services.xserver;
+ cfg = xcfg.desktopManager.xfce;
+
+in
+
+{
+ options = {
+
+ services.xserver.desktopManager.xfce.enable = mkOption {
+ default = false;
+ example = true;
+ description = "Enable the Xfce desktop environment.";
+ };
+
+ };
+
+
+ config = mkIf (xcfg.enable && cfg.enable) {
+
+ services.xserver.desktopManager.session = singleton
+ { name = "xfce";
+ bgSupport = true;
+ start =
+ ''
+ ${pkgs.xfce.xfwm4}/bin/xfwm4 --daemon
+ exec ${pkgs.xfce.terminal}/bin/terminal
+ '';
+ };
+
+ environment.systemPackages =
+ [ pkgs.xfce.xfwm4
+ pkgs.xfce.terminal
+ ];
+
+ };
+
+}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
