From 3a70163557632b6a546a115706545802c348d3ca Mon Sep 17 00:00:00 2001
From: Lgmrszd <lgmrszd@disroot.org>
Date: Sat, 2 Mar 2024 19:45:54 +0300
Subject: [PATCH] Plasma 6 and other stuff

---
 hosts/laptop/configuration.nix | 20 +++++++++++++++-----
 hosts/laptop/home.nix          | 22 +++++++++++++++-------
 2 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix
index 8543e42..3c91875 100644
--- a/hosts/laptop/configuration.nix
+++ b/hosts/laptop/configuration.nix
@@ -207,7 +207,6 @@ in
   services.xserver.enable = true;
 
 
-  # Enable the Plasma 5 Desktop Environment.
   services.xserver.displayManager.sddm.enable = true;
 
   # Didn't like, the theme is a bit buggy
@@ -218,8 +217,8 @@ in
   #     hash = "sha256-SjYwyUvvx/ageqVH5MmYmHNRKNvvnF3DYMJ/f2/L+Go=";
   #   }}/src/catppuccin-latte/";
 
-  services.xserver.desktopManager.plasma5.enable = true;
-  services.xserver.displayManager.defaultSession = "plasmawayland";
+  services.xserver.desktopManager.plasma6.enable = true;
+  services.xserver.displayManager.defaultSession = "plasma";
 
   # programs.command-not-found.enable = false;
   # programs.nix-index.enable = true;
@@ -231,7 +230,10 @@ in
   };
   
   # KDE Programs 
-  programs.partition-manager.enable = true;
+
+  # Currently installs plasma5 variant, disabled as module, enabled manually instead
+  services.dbus.packages = [ pkgs.kdePackages.kpmcore ];
+  # programs.partition-manager.enable = true;
   programs.kdeconnect.enable = true;
 
   programs.adb.enable = true;
@@ -239,6 +241,7 @@ in
   # Steam
   programs.steam = {
     enable = true;
+    gamescopeSession.enable = true;
     remotePlay.openFirewall = true;
 #     dedicatedServer.openFirewall = true;
   };
@@ -306,12 +309,19 @@ in
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
+    # programs.partition-manager installs plasma5 variant, so we have to work around
+    kdePackages.partitionmanager
+    kdePackages.kpmcore
+
+    kdePackages.kaccounts-providers
+    kdePackages.kaccounts-integration
+
     git
     git-crypt
     vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
     wget
-    curl
     python3
+    curl
     # more stuff
     gnome-network-displays
     miraclecast
diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix
index a9fd632..3b94bea 100644
--- a/hosts/laptop/home.nix
+++ b/hosts/laptop/home.nix
@@ -31,7 +31,7 @@
     # file editing
     onlyoffice-bin
     # theming
-    libsForQt5.qtstyleplugin-kvantum
+    kdePackages.qtstyleplugin-kvantum
     # osConfig.nur.repos.baduhai.koi
     (catppuccin-gtk.override {
       variant = "latte";
@@ -59,12 +59,12 @@
     fresh.keepassxc
     onlykey
     onlykey-agent
-    libsForQt5.plasma-vault
+    kdePackages.plasma-vault
     gpgme.dev # For mailvelope
 
     neofetch
-    libsForQt5.yakuake
-    libsForQt5.kgpg
+    kdePackages.yakuake
+    kdePackages.kgpg
 
     # messaging
     (fresh.discord.override {
@@ -72,8 +72,8 @@
     })
     fresh.vesktop
     fresh.telegram-desktop
-    libsForQt5.tokodon
-    libsForQt5.neochat
+    kdePackages.tokodon
+    kdePackages.neochat
 #     pkgs-unstable.cinny-desktop
 #     pkgs-unstable.thunderbird # see programs.thunderbird
     # graphics
@@ -107,7 +107,6 @@
     yt-dlp
     mosh
     appimage-run
-    kate
     ncdu
     # btrfs tools
     btdu # ncdu but for btrfs
@@ -164,6 +163,15 @@
     monero-gui
   ];
 
+  # gnome network manager applet since plasma-nm is not using Secret Service
+  # https://invent.kde.org/plasma/plasma-nm/-/issues/7
+  services.network-manager-applet.enable = true;
+  # Requires tray.target by default so let's remove it
+  systemd.user.services.network-manager-applet.Unit = {
+    Requires = pkgs.lib.mkOverride 0 [ ];
+    After = pkgs.lib.mkOverride 0  [ "graphical-session-pre.target" ];
+  };
+
   # Email stuff
 
   programs.thunderbird = {