8 files changed, 59 insertions, 3 deletions
diff --git a/dot_config/sway/config b/dot_config/sway/config
index 62e23c3..11125ab 100644
--- a/dot_config/sway/config
+++ b/dot_config/sway/config
@@ -256,8 +256,8 @@ bindsym $mod+t exec ~/.config/sway/tb-toggle.sh
 # as waybar modules printing different output from the same script run
 # interactively. PATH is the critical one; GNUPGHOME / GPG_TTY keep
 # pass-otp + pinentry consistent with the interactive shell.
-exec systemctl --user import-environment PATH DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE XDG_SESSION_DESKTOP PASSWORD_STORE_DIR GNUPGHOME GPG_TTY
-exec dbus-update-activation-environment --systemd PATH DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE XDG_SESSION_DESKTOP PASSWORD_STORE_DIR GNUPGHOME GPG_TTY
+exec systemctl --user import-environment PATH DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE XDG_SESSION_DESKTOP XDG_DATA_DIRS PASSWORD_STORE_DIR GNUPGHOME GPG_TTY
+exec dbus-update-activation-environment --systemd PATH DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE XDG_SESSION_DESKTOP XDG_DATA_DIRS PASSWORD_STORE_DIR GNUPGHOME GPG_TTY
 exec "sleep 2 && ~/.config/sway/display-toggle.sh apply"
 exec systemctl --user start sway-session.target
 exec ~/.config/sway/tb-autostart.sh
diff --git a/dot_config/systemd/user/mattermost.service b/dot_config/systemd/user/mattermost.service
new file mode 100644
index 0000000..e6bda87
--- /dev/null
+++ b/dot_config/systemd/user/mattermost.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=Mattermost Desktop (flatpak)
+PartOf=graphical-session.target
+After=graphical-session.target
+ConditionEnvironment=WAYLAND_DISPLAY
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/flatpak run com.mattermost.Desktop
+ExecStop=/usr/bin/flatpak kill com.mattermost.Desktop
+Restart=on-failure
+RestartSec=5s
+TimeoutStopSec=10s
+
+[Install]
+WantedBy=sway-session.target
diff --git a/dot_config/systemd/user/nheko@.service b/dot_config/systemd/user/nheko@.service
new file mode 100644
index 0000000..656f333
--- /dev/null
+++ b/dot_config/systemd/user/nheko@.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Nheko Matrix client (%i profile)
+PartOf=graphical-session.target
+After=graphical-session.target waybar.service
+ConditionEnvironment=DISPLAY
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/flatpak run --die-with-parent im.nheko.Nheko --profile %i
+Restart=on-failure
+RestartSec=5s
+
+[Install]
+WantedBy=sway-session.target
diff --git a/dot_config/systemd/user/sway-session.target b/dot_config/systemd/user/sway-session.target
index 2c31361..e05f2b6 100644
--- a/dot_config/systemd/user/sway-session.target
+++ b/dot_config/systemd/user/sway-session.target
@@ -2,5 +2,5 @@
 Description=sway compositor session
 Documentation=man:systemd.special(7)
 BindsTo=graphical-session.target
-Wants=graphical-session-pre.target mako.service poweralertd.service display-watcher.service swayidle.service cliphist-text.service cliphist-image.service waybar.service signal.service
+Wants=graphical-session-pre.target mako.service poweralertd.service display-watcher.service swayidle.service cliphist-text.service cliphist-image.service waybar.service signal.service mattermost.service nheko@personal.service nheko@work.service whatsie.service
 After=graphical-session-pre.target
diff --git a/dot_config/systemd/user/whatsie.service b/dot_config/systemd/user/whatsie.service
new file mode 100644
index 0000000..01d5b81
--- /dev/null
+++ b/dot_config/systemd/user/whatsie.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=WhatSie (flatpak)
+PartOf=graphical-session.target
+After=graphical-session.target
+ConditionEnvironment=WAYLAND_DISPLAY
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/flatpak run com.ktechpit.whatsie --minimized
+ExecStop=/usr/bin/flatpak kill com.ktechpit.whatsie
+Restart=on-failure
+RestartSec=5s
+TimeoutStopSec=10s
+
+[Install]
+WantedBy=sway-session.target
diff --git a/dot_config/waybar/config.jsonc b/dot_config/waybar/config.jsonc
index 2dbe4b5..b2a2ba8 100644
--- a/dot_config/waybar/config.jsonc
+++ b/dot_config/waybar/config.jsonc
@@ -157,6 +157,9 @@
 
   "tray": {
     "spacing": 8,
+    "icons": {
+      "Mattermost_status_icon_1": "com.mattermost.Desktop",
+    },
   },
 
   "idle_inhibitor": {
diff --git a/meta/flatpak.txt b/meta/flatpak.txt
index 9a4d1c3..bd763b5 100644
--- a/meta/flatpak.txt
+++ b/meta/flatpak.txt
@@ -8,6 +8,7 @@
 # Bundle entries are re-downloaded on `just flatpak-update` whenever the
 # version embedded in the URL differs from the installed version.
 
+im.nheko.Nheko
 io.gitlab.librewolf-community
 io.github.ungoogled_software.ungoogled_chromium
 io.mpv.Mpv
@@ -19,6 +20,8 @@ org.pwmt.zathura
 org.signal.Signal
 org.torproject.torbrowser-launcher
 com.mattermost.Desktop
+com.ktechpit.whatsie
+us.zoom.Zoom
 
 # Portuguese Citizen Card (eID) middleware + GUI. Not on Flathub; ships
 # as a standalone .flatpak bundle from upstream. Bump version by editing
diff --git a/systemd-units/user.txt b/systemd-units/user.txt
index 560b68f..b884f41 100644
--- a/systemd-units/user.txt
+++ b/systemd-units/user.txt
@@ -9,12 +9,16 @@ display-watcher.service
 inhibridge.service
 keybase-gui.service
 mako.service
+mattermost.service
+nheko@personal.service
+nheko@work.service
 pass-secret-service.service
 poweralertd.service
 signal.service
 swayidle.service
 swayrd.service
 waybar.service
+whatsie.service
 wob.service
 
 # --- keybase ---