about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorSymphorien Gibol <symphorien+git@xlumurb.eu>2019-10-06 12:00:00 +0000
committerSymphorien Gibol <symphorien+git@xlumurb.eu>2019-10-06 21:22:44 +0200
commitd9cac95878cde76a4bbce7f4790544f45f724357 (patch)
tree5e445ed7e54815e786b5915448fa4eb0e8b600b8 /nixos
parent6f0e312b4aafa8d4e9eb10627f6717bbbbbcf3f4 (diff)
downloadnixlib-d9cac95878cde76a4bbce7f4790544f45f724357.tar
nixlib-d9cac95878cde76a4bbce7f4790544f45f724357.tar.gz
nixlib-d9cac95878cde76a4bbce7f4790544f45f724357.tar.bz2
nixlib-d9cac95878cde76a4bbce7f4790544f45f724357.tar.lz
nixlib-d9cac95878cde76a4bbce7f4790544f45f724357.tar.xz
nixlib-d9cac95878cde76a4bbce7f4790544f45f724357.tar.zst
nixlib-d9cac95878cde76a4bbce7f4790544f45f724357.zip
nixos/xfce4-14: add xfce4-volumed-pulse when not using the desktop
xfce4-volumed-pulse is not abandoned, but is superseded by a panel
plugin which is not available when not using the desktop.

Fixes: volume up/down keys support
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/x11/desktop-managers/xfce4-14.nix6
1 files changed, 5 insertions, 1 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/xfce4-14.nix b/nixos/modules/services/x11/desktop-managers/xfce4-14.nix
index d75a5a141042..ffc99172e795 100644
--- a/nixos/modules/services/x11/desktop-managers/xfce4-14.nix
+++ b/nixos/modules/services/x11/desktop-managers/xfce4-14.nix
@@ -91,7 +91,11 @@ in
       ++ optional config.powerManagement.enable xfce4-power-manager
       ++ optionals config.hardware.pulseaudio.enable [
         pavucontrol
-        xfce4-pulseaudio-plugin
+        # 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)
       ] ++ optionals cfg.enableXfwm [
         xfwm4
         xfwm4-themes