diff options
| author | Joachim F <joachifm@users.noreply.github.com> | 2017-02-19 15:26:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-19 15:26:07 +0100 |
| commit | ecdfffd9fcdc3f4a8e70838144e616445abb0412 (patch) | |
| tree | 83426d136997d146c15f8471ca6b93287a1a2129 /nixos | |
| parent | f149a32315b8455c48495137dabcc8cec649d4bb (diff) | |
| parent | 7c27554033b95f3a5bb9796fe457bbfbdcfcb85b (diff) | |
| download | nixlib-ecdfffd9fcdc3f4a8e70838144e616445abb0412.tar nixlib-ecdfffd9fcdc3f4a8e70838144e616445abb0412.tar.gz nixlib-ecdfffd9fcdc3f4a8e70838144e616445abb0412.tar.bz2 nixlib-ecdfffd9fcdc3f4a8e70838144e616445abb0412.tar.lz nixlib-ecdfffd9fcdc3f4a8e70838144e616445abb0412.tar.xz nixlib-ecdfffd9fcdc3f4a8e70838144e616445abb0412.tar.zst nixlib-ecdfffd9fcdc3f4a8e70838144e616445abb0412.zip | |
Merge pull request #22433 from laMudri/xfwm-option
xfce: make xfwm optional
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/xfce.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index 530468be5f96..37523feb4140 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -41,6 +41,12 @@ in 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.xfce4-screenshooter pkgs.xfce.xfconf - pkgs.xfce.xfwm4 # This supplies some "abstract" icons such as # "utilities-terminal" and "accessories-text-editor". pkgs.gnome3.defaultIconTheme @@ -99,6 +104,7 @@ in pkgs.xfce.xfce4_appfinder pkgs.xfce.tumbler # found via dbus ] + ++ optional cfg.enableXfwm pkgs.xfce.xfwm4 ++ optional config.powerManagement.enable pkgs.xfce.xfce4_power_manager ++ optional config.networking.networkmanager.enable pkgs.networkmanagerapplet ++ optionals (!cfg.noDesktop) |