From 14232bf369e432efdb01e46f1e969699fccefa36 Mon Sep 17 00:00:00 2001
From: chn <chn@chn.moe>
Date: Tue, 21 May 2024 13:02:25 +0800
Subject: [PATCH] switch to kde6

---
 modules/packages/desktop-extra.nix    |  2 +-
 modules/packages/plasma/default.nix   | 12 ------------
 modules/packages/plasma/krfb.patch    | 15 ---------------
 modules/system/gui.nix                |  4 ++--
 modules/user/chn/plasma/autostart.nix |  2 +-
 5 files changed, 4 insertions(+), 31 deletions(-)
 delete mode 100644 modules/packages/plasma/krfb.patch

diff --git a/modules/packages/desktop-extra.nix b/modules/packages/desktop-extra.nix
index 758b45fc..0346fbde 100644
--- a/modules/packages/desktop-extra.nix
+++ b/modules/packages/desktop-extra.nix
@@ -37,7 +37,7 @@ inputs:
           (texlive.combine { inherit (texlive) scheme-full; inherit (localPackages) citation-style-language; })
           # math, physics and chemistry
           octaveFull root ovito localPackages.vesta localPackages.vaspkit localPackages.v-sim
-        ] ++ (with inputs.lib; filter isDerivation (attrValues plasma5Packages.kdeGear));
+        ] ++ (with inputs.lib; filter isDerivation (attrValues kdePackages.kdeGear));
       };
     };
     programs.kdeconnect.enable = true;
diff --git a/modules/packages/plasma/default.nix b/modules/packages/plasma/default.nix
index df5c07ea..319cac6c 100644
--- a/modules/packages/plasma/default.nix
+++ b/modules/packages/plasma/default.nix
@@ -97,17 +97,5 @@ inputs:
         { configFile.kscreenlockerrc.Daemon.Autolock.value = false; }
       ];
     }];
-    nixpkgs.overlays = [(final: prev:
-    {
-      libsForQt5 = prev.libsForQt5.overrideScope (final: prev:
-      {
-        plasma5 = prev.plasma5.overrideScope (final: prev:
-        {
-          xdg-desktop-portal-kde = prev.xdg-desktop-portal-kde.overrideAttrs (prev:
-            { patches = (prev.patches or []) ++ [ ./krfb.patch ]; });
-        });
-        xdg-desktop-portal-kde = final.plasma5.xdg-desktop-portal-kde;
-      });
-    })];
   };
 }
diff --git a/modules/packages/plasma/krfb.patch b/modules/packages/plasma/krfb.patch
deleted file mode 100644
index 77f2e30d..00000000
--- a/modules/packages/plasma/krfb.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/remotedesktop.cpp b/src/remotedesktop.cpp
-index 9c27b10..100d6f3 100644
---- a/src/remotedesktop.cpp
-+++ b/src/remotedesktop.cpp
-@@ -136,10 +136,6 @@ uint RemoteDesktopPortal::Start(const QDBusObjectPath &handle,
-         Utils::setParentWindow(remoteDesktopDialog->windowHandle(), parent_window);
-         Request::makeClosableDialogRequest(handle, remoteDesktopDialog.get());
-         connect(session, &Session::closed, remoteDesktopDialog.data(), &RemoteDesktopDialog::reject);
--
--        if (!remoteDesktopDialog->exec()) {
--            return 1;
--        }
-     }
- 
-     if (session->screenSharingEnabled()) {
diff --git a/modules/system/gui.nix b/modules/system/gui.nix
index 8e4c957b..9695c6d4 100644
--- a/modules/system/gui.nix
+++ b/modules/system/gui.nix
@@ -21,13 +21,13 @@ inputs:
           sddm.enable = true;
           defaultSession = "plasmawayland";
         };
-        desktopManager.plasma5.enable = true;
+        desktopManager.plasma6.enable = true; 
       };
       systemd.services.display-manager = { after = [ "network-online.target" ]; enable = gui.autoStart; };
       environment =
       {
         sessionVariables."GTK_USE_PORTAL" = "1";
-        plasma5.excludePackages = inputs.lib.mkIf (!gui.preferred) [ inputs.pkgs.plasma5Packages.plasma-nm ];
+        plasma6.excludePackages = inputs.lib.mkIf (!gui.preferred) [ inputs.pkgs.kdePackages.plasma-nm ];
       };
       xdg.portal.extraPortals = map (p: inputs.pkgs."xdg-desktop-portal-${p}") [ "gtk" "kde" "wlr" ];
       i18n.inputMethod =
diff --git a/modules/user/chn/plasma/autostart.nix b/modules/user/chn/plasma/autostart.nix
index 1ff073a7..65dbe998 100644
--- a/modules/user/chn/plasma/autostart.nix
+++ b/modules/user/chn/plasma/autostart.nix
@@ -16,7 +16,7 @@ inputs:
           kclockd = rec
           {
             fileName = "org.kde.kclockd-autostart.desktop";
-            path = "${inputs.pkgs.plasma5Packages.kdeGear.kclock}/etc/xdg/autostart/${fileName}";
+            path = "${inputs.pkgs.kdePackages.kdeGear.kclock}/etc/xdg/autostart/${fileName}";
           };
           yakuake = rec
           {