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

Merge pull request #15024 from abbradar/xfce-no-desktop

Browse Source 
xfce service: add noDesktop option
This commit is contained in:
Nikolay Amiantov 2016-05-14 04:55:27 +03:00
commit 5c39f28a9f
1 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,13 +12,14 @@ in
{ {
options = { options = {
services.xserver.desktopManager.xfce.enable = mkOption { services.xserver.desktopManager.xfce = {
enable = mkOption {
type = types.bool; type = types.bool;
default = false; default = false;
description = "Enable the Xfce desktop environment."; description = "Enable the Xfce desktop environment.";
}; };
services.xserver.desktopManager.xfce.thunarPlugins = mkOption { thunarPlugins = mkOption {
default = []; default = [];
type = types.listOf types.package; type = types.listOf types.package;
example = literalExample "[ pkgs.xfce.thunar-archive-plugin ]"; example = literalExample "[ pkgs.xfce.thunar-archive-plugin ]";
@ -26,6 +27,14 @@ in
A list of plugin that should be installed with Thunar. A list of plugin that should be installed with Thunar.
''; '';
}; };
noDesktop = mkOption {
type = types.bool;
default = false;
description = "Don't install XFCE desktop components (xfdesktop, panel and notification daemon).";
};
};
}; };
@ -62,14 +71,12 @@ in
pkgs.xfce.terminal pkgs.xfce.terminal
(pkgs.xfce.thunar.override { thunarPlugins = cfg.thunarPlugins; }) (pkgs.xfce.thunar.override { thunarPlugins = cfg.thunarPlugins; })
pkgs.xfce.xfce4icontheme pkgs.xfce.xfce4icontheme
pkgs.xfce.xfce4panel
pkgs.xfce.xfce4session pkgs.xfce.xfce4session
pkgs.xfce.xfce4settings pkgs.xfce.xfce4settings
pkgs.xfce.xfce4mixer pkgs.xfce.xfce4mixer
pkgs.xfce.xfce4volumed pkgs.xfce.xfce4volumed
pkgs.xfce.xfce4screenshooter pkgs.xfce.xfce4screenshooter
pkgs.xfce.xfconf pkgs.xfce.xfconf
pkgs.xfce.xfdesktop
pkgs.xfce.xfwm4 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".
@ -81,9 +88,13 @@ in
pkgs.xfce.gvfs pkgs.xfce.gvfs
pkgs.xfce.xfce4_appfinder pkgs.xfce.xfce4_appfinder
pkgs.xfce.tumbler # found via dbus pkgs.xfce.tumbler # found via dbus
pkgs.xfce.xfce4notifyd # found via dbus
] ]
++ optional config.powerManagement.enable pkgs.xfce.xfce4_power_manager; ++ optional config.powerManagement.enable pkgs.xfce.xfce4_power_manager
++ optionals (!cfg.noDesktop)
[ pkgs.xfce.xfce4panel
pkgs.xfce.xfdesktop
pkgs.xfce.xfce4notifyd # found via dbus
];
environment.pathsToLink = environment.pathsToLink =
[ "/share/xfce4" "/share/themes" "/share/mime" "/share/desktop-directories" "/share/gtksourceview-2.0" ]; [ "/share/xfce4" "/share/themes" "/share/mime" "/share/desktop-directories" "/share/gtksourceview-2.0" ];