Remove/rename occurences of kde5

This fixes the attributes accordingly to the following two upstream
commits:

 * NixOS/nixpkgs@f21d4d00152726c02f870cb20faba4aca18ef49a
 * NixOS/nixpkgs@8eb4d2afbc1d61d316073f25f5885a46ccb37ea2

The first renames desktopManager.kde5 to desktopManager.plasma5 and the
second one removes the kde5 attribute from the top-level packages set
and puts applications in kdeApplications instead.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>

4 files changed, 10 insertions, 9 deletions

diff --git a/machines/aszlig/managed/brawndo.nix b/machines/aszlig/managed/brawndo.nix
index 1ba345ce..5154d1ce 100644
--- a/machines/aszlig/managed/brawndo.nix
+++ b/machines/aszlig/managed/brawndo.nix
@@ -63,8 +63,8 @@ in {
     gimp
     git
     htop
-    kde5.gwenview
-    kde5.okular
+    kdeApplications.gwenview
+    kdeApplications.okular
     libreoffice
     miro
     mpv
@@ -101,7 +101,7 @@ in {
       synaptics.twoFingerScroll = true;
 
       displayManager.sddm.enable = true;
-      desktopManager.kde5.enable = true;
+      desktopManager.plasma5.enable = true;
     };
   };
 
diff --git a/machines/aszlig/managed/tyree.nix b/machines/aszlig/managed/tyree.nix
index fa878b1d..ecc93217 100644
--- a/machines/aszlig/managed/tyree.nix
+++ b/machines/aszlig/managed/tyree.nix
@@ -8,9 +8,10 @@
   boot.loader.efi.canTouchEfiVariables = true;
 
   environment.systemPackages = with pkgs; [
-    calibre cdparanoia chromium figlet gajim gimp htop inkscape kde5.gwenview
-    kde5.okular krita libreoffice mosh mpv pciutils thunderbird vlc
-    vuizvui.tomahawk wget wine youtubeDL unfreeAndNonDistributablePkgs.skype
+    calibre cdparanoia chromium figlet gajim gimp htop inkscape thunderbird
+    kdeApplications.gwenview kdeApplications.okular krita libreoffice mosh mpv
+    pciutils vlc vuizvui.tomahawk wget wine youtubeDL
+    unfreeAndNonDistributablePkgs.skype
   ];
 
   fileSystems."/boot".device = "/dev/disk/by-uuid/A0D5-269D";
@@ -71,7 +72,7 @@
   services.xserver.layout = "de";
   services.xserver.xkbOptions = "eurosign:e,caps:none";
   services.xserver.displayManager.sddm.enable = true;
-  services.xserver.desktopManager.kde5.enable = true;
+  services.xserver.desktopManager.plasma5.enable = true;
   services.xserver.desktopManager.xterm.enable = false;
   services.xserver.wacom.enable = true;
 
diff --git a/modules/core/tests.nix b/modules/core/tests.nix
index a1b947e0..33acec13 100644
--- a/modules/core/tests.nix
+++ b/modules/core/tests.nix
@@ -170,7 +170,7 @@ let
     { check = config.services.jenkins.enable;
       path  = ["nixos" "jenkins"];
     }
-    { check = config.services.xserver.desktopManager.kde5.enable;
+    { check = config.services.xserver.desktopManager.plasma5.enable;
       path  = ["nixos" "kde5"];
     }
     { check = config.i18n.consoleKeyMap          == "azerty/fr"
diff --git a/pkgs/tomahawk/default.nix b/pkgs/tomahawk/default.nix
index 26f742a1..632a1d6a 100644
--- a/pkgs/tomahawk/default.nix
+++ b/pkgs/tomahawk/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, fetchurl, cmake, pkgconfig, boost, gnutls
-, libechonest, liblastfm, lucenepp, qt5, kde5, sparsehash, taglib
+, libechonest, liblastfm, lucenepp, qt5, sparsehash, taglib
 , websocketpp, ffmpeg_2, v4l_utils
 
 , enableXMPP      ? true,  libjreen     ? null