From 68f2db74ffbf079696c2ac4143ffdec71a86831d Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 21 Feb 2015 13:59:28 -0600 Subject: [PATCH] kde5: always use plasma-nm --- .../services/x11/desktop-managers/kde5.nix | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index 010a49975e11..2bcb99f3b944 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -88,18 +88,6 @@ in }; environment.systemPackages = - (builtins.attrValues - (removeAttrs plasma5 - [ "deepOverride" "kf5" "override" "overrideDerivation" - "recurseForDerivations" "scope" - ])) - ++ - (builtins.attrValues - (removeAttrs kf5 - [ "deepOverride" "mkDerivation" "override" "overrideDerivation" - "recurseForDerivations" "qt5" "scope" - ])) - ++ [ pkgs.qt4 # qtconfig is the only way to set Qt 4 theme @@ -115,7 +103,8 @@ in pkgs.orion # GTK theme, nearly identical to Breeze ] - ++ (optional config.networking.networkmanager.enable plasma5.plasma-nm) + ++ filter isDerivation (builtins.attrValues plasma5) + ++ filter isDerivation (builtins.attrValues kf5) ++ phononBackendPackages; environment.pathsToLink = [ "/share" ];