public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #22433 from laMudri/xfwm-option 

xfce: make xfwm optional
This commit is contained in:
Joachim F 2017-02-19 15:26:07 +01:00 committed by GitHub
parent f149a32315 7c27554033
commit ecdfffd9fc
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nixos/modules/services/x11/desktop-managers/xfce.nix
View File

@ -41,6 +41,12 @@ in
Shell commands executed just before XFCE is started. Shell commands executed just before XFCE is started.
''; '';
}; };
enableXfwm = mkOption {
type = types.bool;
default = true;
description = "Enable the XFWM (default) window manager.";
};
}; };
}; };
@ -87,7 +93,6 @@ in
pkgs.xfce.xfce4volumed pkgs.xfce.xfce4volumed
pkgs.xfce.xfce4-screenshooter pkgs.xfce.xfce4-screenshooter
pkgs.xfce.xfconf pkgs.xfce.xfconf
pkgs.xfce.xfwm4
# This supplies some "abstract" icons such as # This supplies some "abstract" icons such as
# "utilities-terminal" and "accessories-text-editor". # "utilities-terminal" and "accessories-text-editor".
pkgs.gnome3.defaultIconTheme pkgs.gnome3.defaultIconTheme
@ -99,6 +104,7 @@ in
pkgs.xfce.xfce4_appfinder pkgs.xfce.xfce4_appfinder
pkgs.xfce.tumbler # found via dbus pkgs.xfce.tumbler # found via dbus
] ]
++ optional cfg.enableXfwm pkgs.xfce.xfwm4
++ optional config.powerManagement.enable pkgs.xfce.xfce4_power_manager ++ optional config.powerManagement.enable pkgs.xfce.xfce4_power_manager
++ optional config.networking.networkmanager.enable pkgs.networkmanagerapplet ++ optional config.networking.networkmanager.enable pkgs.networkmanagerapplet
++ optionals (!cfg.noDesktop) ++ optionals (!cfg.noDesktop)