Merge branch 'end-4:main' into main

.config/quickshell/ii/services/Cliphist.qml

@@ -98,4 +98,12 @@ Singleton {
             }
         }
     }
+
+    IpcHandler {
+        target: "cliphistService"
+
+        function update(): void {
+            root.refresh()
+        }
+    }
 }

.config/quickshell/ii/services/ConflictKiller.qml

@@ -0,0 +1,49 @@
+pragma Singleton
+
+import qs
+import qs.modules.common
+import qs.modules.common.functions
+import QtQuick
+import Quickshell
+import Quickshell.Io
+
+Singleton {
+    id: root
+
+    property string killDialogQmlPath: FileUtils.trimFileProtocol(Quickshell.shellPath("killDialog.qml"))
+
+    function load() {
+        // dummy to force init
+    }
+
+    Connections {
+        target: Config
+        function onReadyChanged() {
+            if (Config.ready) checkConflictsProc.running = true
+        }
+    }
+
+    Process {
+        id: checkConflictsProc
+        command: ["bash", "-c", `echo "$(pidof kded6);$(pidof mako dunst)"`]
+        stdout: StdioCollector {
+            onStreamFinished: {
+                const output = this.text;
+                const conflictingTrays = output.split(";")[0].trim().length > 0;
+                const conflictingNotifications = output.split(";")[1].trim().length > 0;
+                var openDialog = false;
+                if (conflictingTrays) {
+                    if (!Config.options.conflictKiller.autoKillTrays) openDialog = true;
+                    else Quickshell.execDetached(["killall", "kded6"])
+                }
+                if (conflictingNotifications) {
+                    if (!Config.options.conflictKiller.autoKillNotificationDaemons) openDialog = true;
+                    else Quickshell.execDetached(["killall", "mako", "dunst"])
+                }
+                if (openDialog) {
+                    Quickshell.execDetached(["qs", "-p", root.killDialogQmlPath])
+                }
+            }
+        }
+    }
+}

.config/quickshell/ii/services/DateTime.qml

@@ -14,6 +14,7 @@ Singleton {
         precision: SystemClock.Minutes
     }
     property string time: Qt.locale().toString(clock.date, Config.options?.time.format ?? "hh:mm")
+    property string shortDate: Qt.locale().toString(clock.date, Config.options?.time.shortDateFormat ?? "dd/MM")
     property string date: Qt.locale().toString(clock.date, Config.options?.time.dateFormat ?? "dddd, dd/MM")
     property string collapsedCalendarFormat: Qt.locale().toString(clock.date, "dd MMMM yyyy")
     property string uptime: "0h, 0m"