From 695b6a0d2e05b7dd0af5de23f6d71af6b36ad55c Mon Sep 17 00:00:00 2001
From: Trolli Schmittlauch <t.schmittlauch@orlives.de>
Date: Tue, 2 Jul 2024 23:43:46 +0200
Subject: [PATCH] plasma5 -> plasma6

for both the NixOS desktop env as well as home-manager packages.

ktouch had to be disabled due to being marked as broken, let's fix this
later
---
 common/default.nix        |  9 +++++--
 common/packages.nix       | 50 ++++-----------------------------------
 home/modules/packages.nix | 10 +++-----
 3 files changed, 15 insertions(+), 54 deletions(-)

diff --git a/common/default.nix b/common/default.nix
index 093c83e..594e9dd 100644
--- a/common/default.nix
+++ b/common/default.nix
@@ -152,8 +152,13 @@ in
   services.xserver.wacom.enable = true;
 
   # Enable the KDE Desktop Environment.
-  services.displayManager.sddm.enable = true;
-  services.xserver.desktopManager.plasma5.enable = true;
+  services.displayManager.sddm = {
+    enable = true;
+    wayland.enable = true;
+  };
+  services.desktopManager.plasma6.enable = true;
+  # enable wayland for Chromium and Electron
+  environment.sessionVariables.NIXOS_OZONE_WL = "1";
 
   # dconf required for several Gnome applications
   programs.dconf.enable = true;
diff --git a/common/packages.nix b/common/packages.nix
index d1c49a7..b5a352a 100644
--- a/common/packages.nix
+++ b/common/packages.nix
@@ -44,53 +44,13 @@
     ethtool
     trace-cmd
 
-      plasma5Packages.kdeGear.akonadi-mime # for KOrganizer
-    ]
-    ++ (
-      with plasma5Packages;
-      with kdeGear;
-      [
-        #akonadi
-        #akonadi-calendar
-        #akonadi-contacts
-        #akonadi-import-wizard
-        #akonadi-mime
-        #akonadi-notes
-        #akonadi-search
-        #akonadiconsole
-        #akregator
-        #kaddressbook
-        #kalarm
-        #kalarmcal
-        #kcalutils
-        #kcontacts
-        #kdav
-        #kdepim-addons
-
-        #kdepim-runtime
-        #kidentitymanagement
-        #kldap
-        #kmail
-        #kmailtransport
-        #kmbox
-        #kmime
-        #kontact
-        #kontactinterface
-        #korganizer
-        #kpimtextedit
-        #libkdepim
-        #libksieve
-        #mailcommon
-        #messagelib
-        #pimcommon
-        #pim-sieve-editor
-
-        # for some Flatpak packkages
-        accountsservice
-      ]
-    );
     # NetworkManager stuff
     networkmanager-openconnect
     networkmanager-vpnc
     networkmanager-openvpn
+    # TODO: is this still necessary?
+    kdePackages.akonadi-mime # for KOrganizer
+    # for some Flatpak packkages
+    accountsservice
+  ];
 }
diff --git a/home/modules/packages.nix b/home/modules/packages.nix
index 955099a..924357f 100644
--- a/home/modules/packages.nix
+++ b/home/modules/packages.nix
@@ -193,9 +193,8 @@ let
   ];
 
   kdeTools =
-    with plasma5Packages;
-    with kdeGear;
-    [
+    [ okteta ]
+    ++ (with kdePackages; [
       okular
       gwenview
       yakuake
@@ -212,16 +211,13 @@ let
       qdirstat
       ark
       kwalletmanager
-      ktouch
+      #ktouch  # TODO: unbreak
       kcharselect
       konversation
-      okteta
       krdc
       skanlite
       akonadiconsole
       tokodon # mastodon client
-    ]
-    ++ (with kdeFrameworks; [
       networkmanager-qt
       kcrash
       breeze-gtk