diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-09-17 00:31:34 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-09-17 00:31:34 +0200 |
| commit | 52e1a198cfb92f9aa36d74be1a11ffeda2f79206 (patch) | |
| tree | eac3dfcec97701c35e6596ce778dfcb6750eebf4 /nixos/modules/services/x11/desktop-managers/xfce.nix | |
| parent | ca0e798e50f65564f0f765e52e5277e3fd279116 (diff) | |
| parent | edcaebf1d9e7b7440985a34e5273b82bce5eb938 (diff) | |
| download | nixlib-52e1a198cfb92f9aa36d74be1a11ffeda2f79206.tar nixlib-52e1a198cfb92f9aa36d74be1a11ffeda2f79206.tar.gz nixlib-52e1a198cfb92f9aa36d74be1a11ffeda2f79206.tar.bz2 nixlib-52e1a198cfb92f9aa36d74be1a11ffeda2f79206.tar.lz nixlib-52e1a198cfb92f9aa36d74be1a11ffeda2f79206.tar.xz nixlib-52e1a198cfb92f9aa36d74be1a11ffeda2f79206.tar.zst nixlib-52e1a198cfb92f9aa36d74be1a11ffeda2f79206.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'nixos/modules/services/x11/desktop-managers/xfce.nix')
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/xfce.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index 387046bd5380..530468be5f96 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -69,7 +69,7 @@ in services.xserver.updateDbusEnvironment = true; environment.systemPackages = - [ pkgs.gtk.out # To get GTK+'s themes and gtk-update-icon-cache + [ pkgs.gtk2.out # To get GTK+'s themes and gtk-update-icon-cache pkgs.hicolor_icon_theme pkgs.tango-icon-theme pkgs.shared_mime_info @@ -100,6 +100,7 @@ in pkgs.xfce.tumbler # found via dbus ] ++ optional config.powerManagement.enable pkgs.xfce.xfce4_power_manager + ++ optional config.networking.networkmanager.enable pkgs.networkmanagerapplet ++ optionals (!cfg.noDesktop) [ pkgs.xfce.xfce4panel pkgs.xfce.xfdesktop |