From 453e312174c0e720bac07649017887f8fb5dd341 Mon Sep 17 00:00:00 2001
From: Ollie Agent <ollie@example.com>
Date: Sun, 19 Jul 2026 13:22:41 +0200
Subject: [PATCH] use cmake --install for KDE, add plasma env script

- install-kde uses cmake --install with CMAKE_INSTALL_PREFIX=~/.local
- 99-ollie.sh sets QT_PLUGIN_PATH and QML_IMPORT_PATH for plasma session
- Fix Kate plugin namespace (kf6/ktexteditor, kf5/ktexteditor)
- Remind user to restart Plasma after install
---
 justfile | 49 ++++++++++++++-----------------------------------
 kde      |  2 +-
 2 files changed, 15 insertions(+), 36 deletions(-)

diff --git a/justfile b/justfile
index 04cb1a2..52d7460 100644
--- a/justfile
+++ b/justfile
@@ -54,7 +54,7 @@ webui:
 
 kde:
     @echo === Building kde tools ===
-    cd kde && cmake -B build-cmake -S .
+    cd kde && cmake -B build-cmake -S . -DCMAKE_INSTALL_PREFIX=~/.local
     cd kde && cmake --build build-cmake -j$(nproc)
 
 # === Install targets ===
@@ -64,10 +64,12 @@ install-9p: install-data install-scripts install-contrib install-kde install-el
     mkdir -p ~/.config/autostart
     install -m644 9p/org.ollie.olliesrv.desktop ~/.config/autostart/
     @echo === Install complete \(9P\) ===
+    @echo 'Restart Plasma to pick up KDE plugins.'
 
 install-dbus: install-data install-scripts install-contrib install-dbus-bin install-kde
     install -m644 prompts/SYSTEM_PROMPT-dbus.md {{cfg}}/prompts/SYSTEM_PROMPT.md
     @echo === Install complete \(D-Bus\) ===
+    @echo 'Restart Plasma to pick up KDE plugins.'
 
 install-dbus-bin:
     @echo === Installing ollied ===
@@ -78,47 +80,23 @@ install-dbus-bin:
 
 install-kde:
     @echo === Installing ollie-kde \(KF6\) ===
-    mkdir -p ~/.local/bin
-    install -m755 kde/build-cmake/ollie-tray ~/.local/bin/
-    install -m755 kde/build-cmake/ollie-gui ~/.local/bin/
+    cmake --install kde/build-cmake
     # Desktop file and icon
     mkdir -p ~/.local/share/applications
     install -m644 kde/gui/org.ollie.gui.desktop ~/.local/share/applications/
     mkdir -p ~/.local/share/icons/hicolor/scalable/apps
     install -m644 kde/gui/ollie.svg ~/.local/share/icons/hicolor/scalable/apps/ollie.svg
-    # KRunner plugin
-    mkdir -p ~/.local/lib/qt6/plugins/kf6/krunner
-    install -m755 kde/build-cmake/lib/kf6/krunner/krunner_ollie.so \
-        ~/.local/lib/qt6/plugins/kf6/krunner/
-    # Kate plugin
-    mkdir -p ~/.local/lib/qt6/plugins/kf6/ktexteditor
-    install -m755 kde/build-cmake/lib/ktexteditor/ollie_kate.so \
-        ~/.local/lib/qt6/plugins/kf6/ktexteditor/
-    # Plasmoid QML plugin library + metadata
-    mkdir -p ~/.local/lib/qt6/qml/org/ollie/private
-    install -m755 kde/build-cmake/org/ollie/private/ollie-plasmoid-pluginplugin.so \
-        ~/.local/lib/qt6/qml/org/ollie/private/libollie-plasmoid-pluginplugin.so
-    install -m644 kde/build-cmake/org/ollie/private/ollie-plasmoid-plugin.qmltypes \
-        ~/.local/lib/qt6/qml/org/ollie/private/
-    install -m755 kde/build-cmake/lib/libollie-plasmoid-plugin.so ~/.local/lib/
-    printf 'module org.ollie.private\nplugin ollie-plasmoid-pluginplugin\ntypeinfo ollie-plasmoid-plugin.qmltypes\ndepends QtQuick\n' | \
-        tee ~/.local/lib/qt6/qml/org/ollie/private/qmldir > /dev/null
-    # Plasmoid package (user-local)
-    kpackagetool6 -t Plasma/Applet -u kde/plasmoid/ 2>/dev/null || \
-        kpackagetool6 -t Plasma/Applet -i kde/plasmoid/
     # Dolphin service menus + helper scripts
     mkdir -p ~/.local/share/kio/servicemenus
-    rm -f ~/.local/share/kio/servicemenus/ollie-actions.desktop
     install -m755 kde/dolphin/ollie-actions.desktop ~/.local/share/kio/servicemenus/
     install -m755 kde/dolphin/ollie-ask ~/.local/bin/
     install -m755 kde/dolphin/ollie-session-here ~/.local/bin/
+    # Plasma session environment
+    mkdir -p ~/.config/plasma-workspace/env
+    install -m755 kde/99-ollie.sh ~/.config/plasma-workspace/env/99-ollie.sh
     # Finalize
     kquitapp6 krunner 2>/dev/null; true
-    @echo === KDE install complete ===
-    @echo 'NOTE: Ensure the following are in your environment:'
-    @echo '  export QT_PLUGIN_PATH=~/.local/lib/qt6/plugins${QT_PLUGIN_PATH:+:$QT_PLUGIN_PATH}'
-    @echo '  export QML2_IMPORT_PATH=~/.local/lib/qt6/qml${QML2_IMPORT_PATH:+:$QML2_IMPORT_PATH}'
-    @echo '  export LD_LIBRARY_PATH=~/.local/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}'
+    @echo === KDE install complete. Restart KDE to pick up plugins. ===
 
 install-el:
     @echo === Installing ellie.el ===
@@ -275,15 +253,16 @@ uninstall:
     rm -f ~/.local/bin/ollie-ask ~/.local/bin/ollie-session-here
     rm -f ~/.local/share/applications/org.ollie.gui.desktop
     rm -f ~/.local/share/icons/hicolor/scalable/apps/ollie.svg
-    rm -f ~/.local/lib/libollie-plasmoid-plugin.so
-    rm -f ~/.local/lib/qt6/plugins/kf6/krunner/krunner_ollie.so
-    rm -f ~/.local/lib/qt6/plugins/kf6/ktexteditor/ollie_kate.so
-    rm -rf ~/.local/lib/qt6/qml/org/ollie
-    kpackagetool6 -t Plasma/Applet -r org.ollie.plasmoid 2>/dev/null; true
+    rm -f ~/.local/lib64/qt6/plugins/kf6/krunner/krunner_ollie.so
+    rm -f ~/.local/lib64/qt6/plugins/ktexteditor/ollie_kate.so
+    rm -rf ~/.local/share/plasma/plasmoids/org.ollie.plasmoid
+    rm -rf ~/.local/lib64/qml/org/ollie
     rm -f ~/.local/share/kio/servicemenus/ollie-actions.desktop
     kquitapp6 krunner 2>/dev/null; true
     # Emacs
     rm -rf ~/.config/emacs/ellie
+    # Plasma env
+    rm -f ~/.config/plasma-workspace/env/99-ollie.sh
     @echo === Uninstall complete ===
 
 # === Test targets ===
diff --git a/kde b/kde
index d0caaa1..cf637b2 160000
--- a/kde
+++ b/kde
@@ -1 +1 @@
-Subproject commit d0caaa1f63735f0a4055c87b97aa310ee8b85f74
+Subproject commit cf637b26747ed1f41dd66ea9dcfce84f7a9eda02