From 38881a3b77bc648b7f6bbefadf153914c4df63b9 Mon Sep 17 00:00:00 2001
From: Markus Katharina Brechtel <markus.katharina.brechtel@thengo.net>
Date: Sun, 10 Jan 2021 04:29:44 +0100
Subject: [PATCH] desktop-apps

---
 tasks/apps.yaml                               |  8 -------
 tasks/clean.yaml                              |  7 ++++++
 tasks/desktop-apps.yaml                       | 24 +++++++++++++++++++
 tasks/main.yaml                               |  1 +
 templates/desktop-apps/desktop-app.service.j2 | 11 +++++++++
 5 files changed, 43 insertions(+), 8 deletions(-)
 delete mode 100644 tasks/apps.yaml
 create mode 100644 tasks/desktop-apps.yaml
 create mode 100644 templates/desktop-apps/desktop-app.service.j2

diff --git a/tasks/apps.yaml b/tasks/apps.yaml
deleted file mode 100644
index e76f661..0000000
--- a/tasks/apps.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-# {% if home_profile != "vdesk" %}
-# blueman-applet &
-# pasystray &
-# nm-applet &
-# {% endif %}
-# {% if home_profile == "presentation" %}
-# unclutter &
-# {% endif %}
diff --git a/tasks/clean.yaml b/tasks/clean.yaml
index abc32a2..82cbd92 100644
--- a/tasks/clean.yaml
+++ b/tasks/clean.yaml
@@ -39,6 +39,13 @@
     scope: user
   failed_when: false
 
+- name: autostart terminal
+  systemd:
+    name: autostart-desktop-app@{{default_terminal}}.service
+    enabled: false
+    scope: user
+  failed_when: false
+
 - name: remove vdesk user service
   file:
     path: ~/.config/systemd/user/vdesk@.service
diff --git a/tasks/desktop-apps.yaml b/tasks/desktop-apps.yaml
new file mode 100644
index 0000000..93b0610
--- /dev/null
+++ b/tasks/desktop-apps.yaml
@@ -0,0 +1,24 @@
+---
+
+- name: desktop app service
+  template:
+    src: desktop-apps/desktop-app.service.j2
+    dest: ~/.config/systemd/user/desktop-app@.service
+    mode: 0755
+  notify: systemd daemon-reload
+
+- name: autostart terminal
+  systemd:
+    name: desktop-app@{{default_terminal}}.service
+    enabled: true
+    scope: user
+
+# {% if home_profile != "vdesk" %}
+# blueman-applet
+# pasystray
+# nm-applet
+# {% endif %}
+
+# {% if home_profile == "presentation" %}
+# unclutter
+# {% endif %}
diff --git a/tasks/main.yaml b/tasks/main.yaml
index 26f3324..cc0423f 100644
--- a/tasks/main.yaml
+++ b/tasks/main.yaml
@@ -20,6 +20,7 @@
     - import_tasks: rofi.yaml
     - import_tasks: x11.yaml
     - import_tasks: vnc.yaml
+    - import_tasks: desktop-apps.yaml
   when: home_desktop
 
 - name: flush handlers
diff --git a/templates/desktop-apps/desktop-app.service.j2 b/templates/desktop-apps/desktop-app.service.j2
new file mode 100644
index 0000000..c429dcf
--- /dev/null
+++ b/templates/desktop-apps/desktop-app.service.j2
@@ -0,0 +1,11 @@
+{{ ansible_managed | comment }}
+
+[Unit]
+Description=desktop app
+PartOf=graphical-session.target
+
+[Service]
+ExecStart=%i
+
+[Install]
+WantedBy=graphical-session.target