diff options
author | worldofpeace <worldofpeace@protonmail.ch> | 2019-09-19 13:25:03 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-19 13:25:03 -0400 |
commit | 1e6f4fb2bcb742b18bf526a945be18a0c0ecac07 (patch) | |
tree | 921c6f2ab7e49a199abe6131859260faa3db6d2c /nixos/modules | |
parent | b0ccd6dd16909c8639c2d9bee7dd2a2a0ac74c30 (diff) | |
parent | 0b73294d60c14a9865bc9317acee2f14716f4d4e (diff) |
Merge pull request #68983 from worldofpeace/xfce-cleanup
Touchups for nixos/xfce4-14 for 19.09
Diffstat (limited to 'nixos/modules')
-rw-r--r-- | nixos/modules/services/x11/desktop-managers/xfce4-14.nix | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/xfce4-14.nix b/nixos/modules/services/x11/desktop-managers/xfce4-14.nix index 458d4a2f422..130e865a1fb 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce4-14.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce4-14.nix @@ -53,6 +53,7 @@ in glib # for gsettings gtk3.out # gtk-update-icon-cache + gnome3.gnome-themes-extra gnome3.adwaita-icon-theme hicolor-icon-theme tango-icon-theme @@ -69,16 +70,17 @@ in exo garcon - gtk-xfce-engine libxfce4ui xfconf mousepad + parole ristretto xfce4-appfinder xfce4-screenshooter xfce4-session xfce4-settings + xfce4-taskmanager xfce4-terminal # TODO: resync patch for plugins @@ -86,12 +88,16 @@ in thunar ] # TODO: NetworkManager doesn't belong here ++ optional config.networking.networkmanager.enable networkmanagerapplet - ++ optional config.hardware.pulseaudio.enable xfce4-pulseaudio-plugin ++ optional config.powerManagement.enable xfce4-power-manager - ++ optional cfg.enableXfwm xfwm4 - ++ optionals (!cfg.noDesktop) [ - xfce4-panel + ++ optionals config.hardware.pulseaudio.enable [ + pavucontrol + xfce4-pulseaudio-plugin + ] ++ optionals cfg.enableXfwm [ + xfwm4 + xfwm4-themes + ] ++ optionals (!cfg.noDesktop) [ xfce4-notifyd + xfce4-panel xfdesktop ]; |