From 663e1b324ec739f67cb06e903bf5c0d2b97979bf Mon Sep 17 00:00:00 2001
From: Markus Katharina Brechtel <markus.katharina.brechtel@thengo.net>
Date: Sat, 9 Jan 2021 23:07:53 +0100
Subject: [PATCH] clean xsession reload script

---
 tasks/apps.yaml                |  8 ++++++++
 tasks/clean.yaml               |  5 +++++
 tasks/x11.yaml                 |  6 ------
 templates/x11/xsession.fish.j2 | 28 ----------------------------
 4 files changed, 13 insertions(+), 34 deletions(-)
 create mode 100644 tasks/apps.yaml
 delete mode 100644 templates/x11/xsession.fish.j2

diff --git a/tasks/apps.yaml b/tasks/apps.yaml
new file mode 100644
index 0000000..e76f661
--- /dev/null
+++ b/tasks/apps.yaml
@@ -0,0 +1,8 @@
+# {% 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 c30bcb7..f85a8cb 100644
--- a/tasks/clean.yaml
+++ b/tasks/clean.yaml
@@ -17,3 +17,8 @@
   file:
     path: ~/.eralitex
     state: absent
+
+- name: remove old xsession fish script
+  file:
+    path: ~/.xsession.fish
+    state: absent
diff --git a/tasks/x11.yaml b/tasks/x11.yaml
index 2e78101..b91e0c6 100644
--- a/tasks/x11.yaml
+++ b/tasks/x11.yaml
@@ -10,12 +10,6 @@
     src: x11/Xmodmap.j2
     dest: ~/.Xmodmap
 
-- name: xsession script
-  template:
-    src: x11/xsession.fish.j2
-    dest: ~/.xsession.fish
-    mode: 0755
-
 - name: xsession reload script
   template:
     src: x11/xsession.reload.fish.j2
diff --git a/templates/x11/xsession.fish.j2 b/templates/x11/xsession.fish.j2
deleted file mode 100644
index 6ccf1a1..0000000
--- a/templates/x11/xsession.fish.j2
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/fish
-
-{{ ansible_managed | comment }}
-
-# set PATH so it includes users
-# private bin directory if it exists
-if test -d "$HOME/bin"
-  set -x PATH "$HOME/bin:$PATH"
-end
-
-# xsession reload script
-source ~/.xsession.reload.fish
-
-{% if home_profile != "vdesk" %}
-blueman-applet &
-pasystray &
-nm-applet &
-{% endif %}
-
-{% if home_profile != "presentation" and home_profile != "vdesk" %}
-/usr/local/bin/screensaver-start &
-{% endif %}
-
-{% if home_profile == "presentation" %}
-unclutter &
-{% endif %}
-
-exec /usr/bin/i3