From 22a7de63547f38571243d9275f355db38df5699a Mon Sep 17 00:00:00 2001
From: JJ <git@toki.la>
Date: Sat, 4 May 2024 14:45:24 -0700
Subject: [PATCH 1/3] plasma6: mark dolphin + spectacle as optional packages

---
 nixos/modules/services/desktop-managers/plasma6.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/desktop-managers/plasma6.nix b/nixos/modules/services/desktop-managers/plasma6.nix
index 08507b4d370a..a1baf54024d6 100644
--- a/nixos/modules/services/desktop-managers/plasma6.nix
+++ b/nixos/modules/services/desktop-managers/plasma6.nix
@@ -135,14 +135,11 @@ in {
         ksystemstats
         libksysguard
 
-        spectacle
         systemsettings
         kcmutils
 
         # Gear
         baloo
-        dolphin
-        dolphin-plugins
         ffmpegthumbs
         kdegraphics-thumbnailers
         kde-inotify-survey
@@ -154,7 +151,6 @@ in {
         plasma-browser-integration
         konsole
         (lib.getBin qttools) # Expose qdbus in PATH
-
         ark
         elisa
         gwenview
@@ -162,6 +158,9 @@ in {
         kate
         khelpcenter
         print-manager
+        dolphin
+        dolphin-plugins
+        spectacle
       ];
     in
       requiredPackages

From 0a8f72f2ed23fb0dfce42f6076ca9a5995f6b5d1 Mon Sep 17 00:00:00 2001
From: JJ <git@toki.la>
Date: Sat, 4 May 2024 17:59:25 -0700
Subject: [PATCH 2/3] plasma6: reorganize & describe dependencies

---
 .../services/desktop-managers/plasma6.nix     | 42 +++++++------------
 1 file changed, 14 insertions(+), 28 deletions(-)

diff --git a/nixos/modules/services/desktop-managers/plasma6.nix b/nixos/modules/services/desktop-managers/plasma6.nix
index a1baf54024d6..43f6b3a6485a 100644
--- a/nixos/modules/services/desktop-managers/plasma6.nix
+++ b/nixos/modules/services/desktop-managers/plasma6.nix
@@ -60,10 +60,8 @@ in {
     qt.enable = true;
     environment.systemPackages = with kdePackages; let
       requiredPackages = [
-        # Hack? To make everything run on Wayland
-        qtwayland
-        # Needed to render SVG icons
-        qtsvg
+        qtwayland # Hack? To make everything run on Wayland
+        qtsvg # Needed to render SVG icons
 
         # Frameworks with globally loadable bits
         frameworkintegration # provides Qt plugin
@@ -75,6 +73,9 @@ in {
         kiconthemes # provides Qt plugins
         kimageformats # provides Qt plugins
         kio # provides helper service + a bunch of other stuff
+        kio-admin # managing files as admin
+        kio-extras # stuff for MTP, AFC, etc
+        kio-fuse # fuse interaction
         kpackage # provides kpackagetool tool
         kservice # provides kbuildsycoca6 tool
         kwallet # provides helper service
@@ -87,30 +88,27 @@ in {
         # Core Plasma parts
         kwin
         pkgs.xwayland
-
         kscreen
         libkscreen
-
         kscreenlocker
-
         kactivitymanagerd
         kde-cli-tools
-        kglobalacceld
+        kglobalacceld # keyboard shortcut daemon
         kwrited # wall message proxy, not to be confused with kwrite
-
-        milou
-        polkit-kde-agent-1
-
+        baloo # system indexer
+        milou # search engine atop baloo
+        ffmpegthumbs # video thumbnailer
+        kdegraphics-thumbnailers # pdf etc thumbnailer
+        polkit-kde-agent-1 # polkit auth ui
         plasma-desktop
         plasma-workspace
-
-        # Crash handler
-        drkonqi
+        drkonqi # crash handler
+        kde-inotify-survey # handles running out of inodes
 
         # Application integration
         libplasma # provides Kirigami platform theme
         plasma-integration # provides Qt platform theme
-        kde-gtk-config
+        kde-gtk-config # syncs KDE settings to GTK
 
         # Artwork + themes
         breeze
@@ -124,28 +122,16 @@ in {
 
         # misc Plasma extras
         kdeplasma-addons
-
         pkgs.xdg-user-dirs # recommended upstream
 
         # Plasma utilities
         kmenuedit
-
         kinfocenter
         plasma-systemmonitor
         ksystemstats
         libksysguard
-
         systemsettings
         kcmutils
-
-        # Gear
-        baloo
-        ffmpegthumbs
-        kdegraphics-thumbnailers
-        kde-inotify-survey
-        kio-admin
-        kio-extras
-        kio-fuse
       ];
       optionalPackages = [
         plasma-browser-integration

From d9443cb26b5817427abd61deb1b8aef94a2fb94b Mon Sep 17 00:00:00 2001
From: JJ <git@toki.la>
Date: Sat, 18 May 2024 13:41:50 -0700
Subject: [PATCH 3/3] plasma6: move ffmpegthumbs to optional, clarify comments

---
 nixos/modules/services/desktop-managers/plasma6.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/desktop-managers/plasma6.nix b/nixos/modules/services/desktop-managers/plasma6.nix
index 43f6b3a6485a..1dc1c00a40be 100644
--- a/nixos/modules/services/desktop-managers/plasma6.nix
+++ b/nixos/modules/services/desktop-managers/plasma6.nix
@@ -75,7 +75,7 @@ in {
         kio # provides helper service + a bunch of other stuff
         kio-admin # managing files as admin
         kio-extras # stuff for MTP, AFC, etc
-        kio-fuse # fuse interaction
+        kio-fuse # fuse interface for KIO
         kpackage # provides kpackagetool tool
         kservice # provides kbuildsycoca6 tool
         kwallet # provides helper service
@@ -97,13 +97,12 @@ in {
         kwrited # wall message proxy, not to be confused with kwrite
         baloo # system indexer
         milou # search engine atop baloo
-        ffmpegthumbs # video thumbnailer
         kdegraphics-thumbnailers # pdf etc thumbnailer
         polkit-kde-agent-1 # polkit auth ui
         plasma-desktop
         plasma-workspace
         drkonqi # crash handler
-        kde-inotify-survey # handles running out of inodes
+        kde-inotify-survey # warns the user on low inotifywatch limits
 
         # Application integration
         libplasma # provides Kirigami platform theme
@@ -147,6 +146,7 @@ in {
         dolphin
         dolphin-plugins
         spectacle
+        ffmpegthumbs
       ];
     in
       requiredPackages