From f9182a61b8f779563c10af7b853a7d5eef6c9609 Mon Sep 17 00:00:00 2001
From: materus <materus@podkos.pl>
Date: Mon, 4 Mar 2024 12:33:48 +0100
Subject: [PATCH] materusPC: change to plasma6

---
 configurations/host/materusPC/kde.nix | 10 ++++------
 configurations/host/materusPC/tmp.nix |  6 +++---
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/configurations/host/materusPC/kde.nix b/configurations/host/materusPC/kde.nix
index 9202794..302f433 100644
--- a/configurations/host/materusPC/kde.nix
+++ b/configurations/host/materusPC/kde.nix
@@ -24,7 +24,7 @@ let
   ;
 in
 {
-  services.xserver.displayManager.defaultSession = "plasmawayland";
+  services.xserver.displayManager.defaultSession = "plasma";
   services.xserver.displayManager.sddm.enable = true;
   services.xserver.displayManager.sddm.settings = {
     General = {
@@ -40,12 +40,10 @@ in
       
     };
   };
-  services.xserver.desktopManager.plasma5.enable = true;
-  services.xserver.desktopManager.plasma5.phononBackend = "gstreamer";
-  services.xserver.desktopManager.plasma5.useQtScaling = true;
-  services.xserver.desktopManager.plasma5.runUsingSystemd = true;
+  services.xserver.desktopManager.plasma6.enable = true;
+  services.xserver.desktopManager.plasma6.enableQt5Integration = true;
   programs.gnupg.agent.pinentryFlavor = "gnome3";
-  environment.plasma5.excludePackages = with pkgs; [ libsForQt5.kwallet libsForQt5.kwalletmanager libsForQt5.kwallet-pam ];
+  environment.plasma6.excludePackages = with pkgs.kdePackages; [ kwallet kwalletmanager kwallet-pam ];
   
   environment.variables = {
     # Old fix for black cursor on amdgpu, seems to work fine now
diff --git a/configurations/host/materusPC/tmp.nix b/configurations/host/materusPC/tmp.nix
index a92375f..bffc01c 100644
--- a/configurations/host/materusPC/tmp.nix
+++ b/configurations/host/materusPC/tmp.nix
@@ -136,7 +136,7 @@
   '';
 
   i18n.inputMethod.enabled = "fcitx5";
-  i18n.inputMethod.fcitx5.addons = [ pkgs.fcitx5-configtool pkgs.fcitx5-lua pkgs.fcitx5-mozc pkgs.fcitx5-gtk pkgs.libsForQt5.fcitx5-qt ];
+  i18n.inputMethod.fcitx5.addons = [ pkgs.fcitx5-configtool pkgs.fcitx5-lua pkgs.fcitx5-mozc pkgs.fcitx5-gtk pkgs.kdePackages.fcitx5-qt];
 
 
   # Some programs need SUID wrappers, can be configured further or are
@@ -198,13 +198,13 @@
     gamescope
     #(pkgs.lutris.override { extraLibraries = pkgs: with pkgs;  [ pkgs.samba pkgs.jansson pkgs.tdb pkgs.libunwind pkgs.libusb1 pkgs.gnutls pkgs.gtk3 pkgs.pango ]; })
     materusArg.pkgs.amdgpu-pro-libs.prefixes
-    (pkgs.bottles.override { extraPkgs = pkgs: [ pkgs.libsForQt5.breeze-qt5 pkgs.libsForQt5.breeze-gtk pkgs.nss_latest ]; extraLibraries = pkgs: [ pkgs.samba pkgs.jansson pkgs.tdb pkgs.libunwind pkgs.libusb1 pkgs.gnutls pkgs.gtk3 pkgs.pango ]; })
+    (pkgs.bottles.override { extraPkgs = pkgs: [ pkgs.libsForQt5.breeze-qt5 pkgs.kdePackages.breeze-gtk pkgs.nss_latest ]; extraLibraries = pkgs: [ pkgs.samba pkgs.jansson pkgs.tdb pkgs.libunwind pkgs.libusb1 pkgs.gnutls pkgs.gtk3 pkgs.pango ]; })
     glibc
     glib
     gtk3
     gtk4
     gsettings-desktop-schemas
-    libsForQt5.dolphin
+    kdePackages.dolphin
     vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
 
     patchelf