1 files changed, 46 insertions, 0 deletions

diff --git a/accounts/gkleen@sif/shell/quickshell-plugins/Systemd.hpp b/accounts/gkleen@sif/shell/quickshell-plugins/Systemd.hpp
index 615024d2..98f73d8f 100644
--- a/accounts/gkleen@sif/shell/quickshell-plugins/Systemd.hpp
+++ b/accounts/gkleen@sif/shell/quickshell-plugins/Systemd.hpp
@@ -3,6 +3,7 @@
 #include <cstdint>
 #include <memory>
 #include <string>
+#include <optional>
 
 #include <QObject>
 #include <QDBusInterface>
@@ -11,8 +12,47 @@
 #include "dbus_systemd_manager.h"
 #include "dbus_logind_manager.h"
 #include "dbus_logind_session.h"
+#include "dbus_systemd_unit.h"
+#include "dbus_systemd_service.h"
 #include "dbus_properties.h"
 
+#include "core/model.hpp"
+
+class SystemdUnit : public QObject {
+  Q_OBJECT;
+  QML_ELEMENT;
+  QML_UNCREATABLE("SystemdUnits cannot be created directly");
+
+public:
+  explicit SystemdUnit(QObject* parent, const QDBusObjectPath& path, const QString& id);
+
+  Q_PROPERTY(QDBusObjectPath path READ path CONSTANT);
+  Q_PROPERTY(QString id READ id CONSTANT);
+  Q_PROPERTY(QList<QString> runtimeDirectory READ runtimeDirectory CONSTANT);
+  Q_PROPERTY(QString activeState READ activeState NOTIFY activeStateChanged);
+
+  const QDBusObjectPath& path() const;
+  const QString& id() const;
+  QList<QString> runtimeDirectory();
+  QString activeState();
+
+signals:
+  void activeStateChanged();
+
+private slots:
+  void onUnitPropertiesChanged(const QString& interface_name, const QVariantMap& changed_properties, const QStringList& invalidated_properties);
+
+private:
+  std::unique_ptr<DBusSystemdUnit> systemdUnit();
+  std::unique_ptr<DBusSystemdService> systemdService();
+
+  DBusProperties* mUnitProperties;
+  QDBusObjectPath mPath;
+  QString mId;
+  std::optional<QString> mActiveState;
+  std::optional<QList<QString>> mRuntimeDirectory;
+};
+
 class Systemd : public QObject {
   Q_OBJECT;
   QML_SINGLETON;
@@ -23,6 +63,7 @@ public:
 
   Q_PROPERTY(bool idleHint READ idleHint WRITE setIdleHint NOTIFY idleHintChanged)
   Q_PROPERTY(bool lockedHint READ lockedHint WRITE setLockedHint NOTIFY lockedHintChanged)
+  Q_PROPERTY(UntypedObjectModel* userUnits READ userUnits CONSTANT)
 
   Q_INVOKABLE void stopUserUnit(const QString& unit, const QString& mode);
   Q_INVOKABLE void setBrightness(const QString& subsystem, const QString& name, quint32 brightness);
@@ -34,6 +75,7 @@ public:
 
   bool idleHint();
   bool lockedHint();
+  ObjectModel<SystemdUnit>* userUnits();
 
 signals:
   void shutdown(bool before);
@@ -45,12 +87,16 @@ signals:
 
 private slots:
   void onLogindSessionPropertiesChanged(const QString& interface_name, const QVariantMap& changed_properties, const QStringList& invalidated_properties);
+  void onUserUnitNew(const QString& id, const QDBusObjectPath& objectPath);
+  void onUserUnitRemoved(const QString& id, const QDBusObjectPath& objectPath);
 
 private:
   DBusSystemdManager* systemdManager;
   DBusLogindManager* logindManager;
   DBusLogindSession* logindSession;
   DBusProperties* logindSessionProperties;
+
+  ObjectModel<SystemdUnit> mUserUnits{this};
 };
 
 class SystemdInhibitorParams : public QObject {