Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 412da0bf9ea3
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8256a903c4df
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 6, 2019

  1. 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
    @symphorien
    symphorien committed Oct 6, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    shuding Shu Ding
    GPG key ID: 899520937F032E83
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d9cac95 View commit details

  2. Merge pull request #70537 from symphorien/xfce-media-keys 

    nixos/xfce4-14: add xfce4-volumed-pulse when not using the desktop
    @worldofpeace
    worldofpeace authored Oct 6, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8256a90 View commit details
Showing with 5 additions and 1 deletion.
  1. +5 −1 nixos/modules/services/x11/desktop-managers/xfce4-14.nix
6 changes: 5 additions & 1 deletion nixos/modules/services/x11/desktop-managers/xfce4-14.nix
View file
Original file line number Diff line number Diff line change
@@ -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