From 6a50003587e317e91c7bacacfe137a725c756ccd Mon Sep 17 00:00:00 2001
From: jalr <mail@jalr.de>
Date: Thu, 7 Jun 2018 21:18:49 +0200
Subject: [PATCH 1/3] Revert "Merge branch 'disable-screensaver' into 'master'"

This reverts commit 7a1a3f416790b6c73166f349eb1c83ef025a688c, reversing
changes made to d1af96f01f35585fbe08f1d33d0bdfe1ac903ef0.
---
 packer/ansible/roles/windowmanager/tasks/mate.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/packer/ansible/roles/windowmanager/tasks/mate.yml b/packer/ansible/roles/windowmanager/tasks/mate.yml
index 23ab80f..b7c1918 100644
--- a/packer/ansible/roles/windowmanager/tasks/mate.yml
+++ b/packer/ansible/roles/windowmanager/tasks/mate.yml
@@ -19,8 +19,3 @@
   copy:
     src: autostart.desktop
     dest: /etc/skel/.config/autostart/autostart.desktop
-
-- name: disable screensaver
-  file:
-    path: /etc/xdg/autostart/mate-screensaver.desktop
-    state: absent

From be3ecf3a29c9f023bcd9a1008e6e85e3106254f2 Mon Sep 17 00:00:00 2001
From: jalr <mail@jalr.de>
Date: Sun, 21 Oct 2018 17:08:30 +0200
Subject: [PATCH 2/3] apt pin mate-screensaver so that it is never installed

---
 .../roles/windowmanager/files/apt-preferences-mate-desktop | 7 +++++++
 packer/ansible/roles/windowmanager/tasks/mate.yml          | 5 +++++
 2 files changed, 12 insertions(+)
 create mode 100644 packer/ansible/roles/windowmanager/files/apt-preferences-mate-desktop

diff --git a/packer/ansible/roles/windowmanager/files/apt-preferences-mate-desktop b/packer/ansible/roles/windowmanager/files/apt-preferences-mate-desktop
new file mode 100644
index 0000000..760a4d8
--- /dev/null
+++ b/packer/ansible/roles/windowmanager/files/apt-preferences-mate-desktop
@@ -0,0 +1,7 @@
+Package: mate-screensaver
+Pin: release o=Debian
+Pin-Priority: -1
+
+Package: mate-screensaver-common
+Pin: release o=Debian
+Pin-Priority: -1
diff --git a/packer/ansible/roles/windowmanager/tasks/mate.yml b/packer/ansible/roles/windowmanager/tasks/mate.yml
index b7c1918..2f296d1 100644
--- a/packer/ansible/roles/windowmanager/tasks/mate.yml
+++ b/packer/ansible/roles/windowmanager/tasks/mate.yml
@@ -1,4 +1,9 @@
 ---
+- name: configure apt preferences for mate-desktop components
+  copy:
+    src: apt-preferences-mate-desktop
+    dest: /etc/apt/preferences.d/mate-desktop
+
 - name: install mate
   apt:
     name: "task-mate-desktop"

From 21417ea14c80539bc24a6aa4a1977c43e6518aab Mon Sep 17 00:00:00 2001
From: jalr <mail@jalr.de>
Date: Sun, 21 Oct 2018 17:11:20 +0200
Subject: [PATCH 3/3] disable screensaver / screen blanking

---
 packer/ansible/roles/windowmanager/files/autostart | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packer/ansible/roles/windowmanager/files/autostart b/packer/ansible/roles/windowmanager/files/autostart
index d29db82..a864d68 100755
--- a/packer/ansible/roles/windowmanager/files/autostart
+++ b/packer/ansible/roles/windowmanager/files/autostart
@@ -11,6 +11,9 @@ gsettings set org.mate.background picture-filename '/etc/lightdm/bg.jpg'
 gsettings set org.mate.interface font-name 'Roboto 10'
 gsettings set org.mate.interface document-font-name 'Roboto 10'
 
+# disable screensaver / screen blanking
+xset s off -dpms
+
 if echo $USER | grep -E 'guest-*'; then
 	gsettings set org.mate.screensaver lock-enabled false
 	zenity \