diff options
author | Thomas Tuegel <ttuegel@gmail.com> | 2016-01-08 14:20:46 -0600 |
---|---|---|
committer | Thomas Tuegel <ttuegel@gmail.com> | 2016-01-08 14:20:46 -0600 |
commit | fdefc0cb2c0fac1e02cadbc5ea53bfc234d2953e (patch) | |
tree | 438a071359823ebd1228f43269b7de2f7ce0fe97 /nixos | |
parent | d81538ff49d63774684cc1f83cf44a4a061fb38d (diff) | |
parent | 049357bb3083930750a3f01d36b42dae55f9bb2e (diff) | |
download | nixpkgs-fdefc0cb2c0fac1e02cadbc5ea53bfc234d2953e.tar nixpkgs-fdefc0cb2c0fac1e02cadbc5ea53bfc234d2953e.tar.gz nixpkgs-fdefc0cb2c0fac1e02cadbc5ea53bfc234d2953e.tar.bz2 nixpkgs-fdefc0cb2c0fac1e02cadbc5ea53bfc234d2953e.tar.lz nixpkgs-fdefc0cb2c0fac1e02cadbc5ea53bfc234d2953e.tar.xz nixpkgs-fdefc0cb2c0fac1e02cadbc5ea53bfc234d2953e.tar.zst nixpkgs-fdefc0cb2c0fac1e02cadbc5ea53bfc234d2953e.zip |
Merge branch 'kdenetwork-filesharing'
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/services/x11/desktop-managers/kde5.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index 2aeb4f67d77..e8c768e41fa 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -102,6 +102,7 @@ in kde5.gwenview kde5.kate kde5.kdegraphics-thumbnailers + kde5.kio-extras kde5.konsole kde5.okular kde5.print-manager @@ -125,6 +126,7 @@ in ++ lib.optional config.networking.networkmanager.enable kde5.plasma-nm ++ lib.optional config.hardware.pulseaudio.enable kde5.plasma-pa ++ lib.optional config.powerManagement.enable kde5.powerdevil + ++ lib.optionals config.services.samba.enable [ kde5.kdenetwork-filesharing pkgs.samba ] ++ lib.optionals cfg.phonon.gstreamer.enable [ |