pyrox.dev / nixpkgs
lol
fork atom

nixos/xfce: fix after #369419 removed with lib (#369745)

authored by philiptaron.tngl.sh and committed by

GitHub 0541d0ed 34f5f7e1

+6 -6
unified split
+6 -6
nixos/modules/services/x11/desktop-managers/xfce.nix
··· 127 xfce.xfce4-taskmanager 128 xfce.xfce4-terminal 129 ] # TODO: NetworkManager doesn't belong here 130 - ++ optional config.networking.networkmanager.enable networkmanagerapplet 131 - ++ optional config.powerManagement.enable xfce.xfce4-power-manager 132 - ++ optionals (config.services.pulseaudio.enable || config.services.pipewire.pulse.enable) [ 133 pavucontrol 134 # volume up/down keys support: 135 # xfce4-pulseaudio-plugin includes all the functionalities of xfce4-volumed-pulse 136 # but can only be used with xfce4-panel, so for no-desktop usage we still include 137 # xfce4-volumed-pulse 138 (if cfg.noDesktop then xfce.xfce4-volumed-pulse else xfce.xfce4-pulseaudio-plugin) 139 - ] ++ optionals cfg.enableXfwm [ 140 xfce.xfwm4 141 xfce.xfwm4-themes 142 - ] ++ optionals (!cfg.noDesktop) [ 143 xfce.xfce4-panel 144 xfce.xfdesktop 145 - ] ++ optional cfg.enableScreensaver xfce.xfce4-screensaver) excludePackages; 146 147 programs.gnupg.agent.pinentryPackage = lib.mkDefault pkgs.pinentry-gtk2; 148 programs.xfconf.enable = true;
··· 127 xfce.xfce4-taskmanager 128 xfce.xfce4-terminal 129 ] # TODO: NetworkManager doesn't belong here 130 + ++ lib.optional config.networking.networkmanager.enable networkmanagerapplet 131 + ++ lib.optional config.powerManagement.enable xfce.xfce4-power-manager 132 + ++ lib.optionals (config.services.pulseaudio.enable || config.services.pipewire.pulse.enable) [ 133 pavucontrol 134 # volume up/down keys support: 135 # xfce4-pulseaudio-plugin includes all the functionalities of xfce4-volumed-pulse 136 # but can only be used with xfce4-panel, so for no-desktop usage we still include 137 # xfce4-volumed-pulse 138 (if cfg.noDesktop then xfce.xfce4-volumed-pulse else xfce.xfce4-pulseaudio-plugin) 139 + ] ++ lib.optionals cfg.enableXfwm [ 140 xfce.xfwm4 141 xfce.xfwm4-themes 142 + ] ++ lib.optionals (!cfg.noDesktop) [ 143 xfce.xfce4-panel 144 xfce.xfdesktop 145 + ] ++ lib.optional cfg.enableScreensaver xfce.xfce4-screensaver) excludePackages; 146 147 programs.gnupg.agent.pinentryPackage = lib.mkDefault pkgs.pinentry-gtk2; 148 programs.xfconf.enable = true;