nixos/xfce: Fix ambiguous with

Pull request 345352 introduces `pkgs.exo`, don't pick up that package.
This commit is contained in:
Sandro Jäckel 2024-10-04 23:57:19 +02:00 committed by Bobby Rong
parent 73bed75dbd
commit 9b996f7396
No known key found for this signature in database

View File

@ -80,7 +80,7 @@ in
};
config = mkIf cfg.enable {
environment.systemPackages = utils.removePackagesByName (with pkgs.xfce // pkgs; [
environment.systemPackages = utils.removePackagesByName (with pkgs; [
glib # for gsettings
gtk3.out # gtk-update-icon-cache
@ -88,7 +88,7 @@ in
adwaita-icon-theme
hicolor-icon-theme
tango-icon-theme
xfce4-icon-theme
xfce.xfce4-icon-theme
desktop-file-utils
shared-mime-info # for update-mime-database
@ -99,37 +99,37 @@ in
# Needed by Xfce's xinitrc script
xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/
exo
garcon
libxfce4ui
xfce.exo
xfce.garcon
xfce.libxfce4ui
mousepad
parole
ristretto
xfce4-appfinder
xfce4-notifyd
xfce4-screenshooter
xfce4-session
xfce4-settings
xfce4-taskmanager
xfce4-terminal
xfce.mousepad
xfce.parole
xfce.ristretto
xfce.xfce4-appfinder
xfce.xfce4-notifyd
xfce.xfce4-screenshooter
xfce.xfce4-session
xfce.xfce4-settings
xfce.xfce4-taskmanager
xfce.xfce4-terminal
] # TODO: NetworkManager doesn't belong here
++ optional config.networking.networkmanager.enable networkmanagerapplet
++ optional config.powerManagement.enable xfce4-power-manager
++ optional config.powerManagement.enable xfce.xfce4-power-manager
++ optionals (config.hardware.pulseaudio.enable || config.services.pipewire.pulse.enable) [
pavucontrol
# volume up/down keys support:
# xfce4-pulseaudio-plugin includes all the functionalities of xfce4-volumed-pulse
# but can only be used with xfce4-panel, so for no-desktop usage we still include
# xfce4-volumed-pulse
(if cfg.noDesktop then xfce4-volumed-pulse else xfce4-pulseaudio-plugin)
(if cfg.noDesktop then xfce.xfce4-volumed-pulse else xfce.xfce4-pulseaudio-plugin)
] ++ optionals cfg.enableXfwm [
xfwm4
xfwm4-themes
xfce.xfwm4
xfce.xfwm4-themes
] ++ optionals (!cfg.noDesktop) [
xfce4-panel
xfdesktop
] ++ optional cfg.enableScreensaver xfce4-screensaver) excludePackages;
xfce.xfce4-panel
xfce.xfdesktop
] ++ optional cfg.enableScreensaver xfce.xfce4-screensaver) excludePackages;
programs.gnupg.agent.pinentryPackage = mkDefault pkgs.pinentry-gtk2;
programs.xfconf.enable = true;