From 6b29f628dbc2e91d66273f094c0ced507f16662b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20K=C3=B6rber?= <hannes@hkoerber.de>
Date: Mon, 25 Oct 2021 19:44:09 +0200
Subject: [PATCH] Remove signal

---
 autostart/autostart.target.j2     |  1 -
 autostart/services/signal.service |  7 -------
 packages.yml                      |  6 +++---
 playbook.yml                      | 21 ---------------------
 4 files changed, 3 insertions(+), 32 deletions(-)
 delete mode 100644 autostart/services/signal.service

diff --git a/autostart/autostart.target.j2 b/autostart/autostart.target.j2
index c5871ff..9e29730 100644
--- a/autostart/autostart.target.j2
+++ b/autostart/autostart.target.j2
@@ -21,7 +21,6 @@ Wants=pasystray.service
 Wants=redshift.service
 Wants=restic.timer
 Wants=screencfg.service
-Wants=signal.service
 Wants=spotify.service
 Wants=steam.service
 Wants=touchpad.service
diff --git a/autostart/services/signal.service b/autostart/services/signal.service
deleted file mode 100644
index 88bb05f..0000000
--- a/autostart/services/signal.service
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-BindsTo=autostart.target
-After=windowmanager.target
-
-[Service]
-ExecStart=/usr/bin/env signal-desktop
-PassEnvironment=DISPLAY
diff --git a/packages.yml b/packages.yml
index 2f410f2..c8995b3 100644
--- a/packages.yml
+++ b/packages.yml
@@ -377,9 +377,6 @@ packages:
     ncdu:
       ubuntu: ["ncdu"]
       archlinux: ["ncdu"]
-    signal:
-      ubuntu: []
-      archlinux: ["signal-desktop"]
 
   remove:
     mousepad:
@@ -394,3 +391,6 @@ packages:
     golang:
       ubuntu: ["golang-go"]
       archlinux: ["go"]
+    signal:
+      ubuntu: []
+      archlinux: ["signal-desktop"]
diff --git a/playbook.yml b/playbook.yml
index f46345d..e076627 100644
--- a/playbook.yml
+++ b/playbook.yml
@@ -560,27 +560,6 @@
 
       tags: [spotify]
 
-    - block:
-      - name: add signal apt key
-        apt_key:
-          url: "https://updates.signal.org/desktop/apt/keys.asc"
-          id: "D980A17457F6FB06"
-        become: true
-
-      - name: add signal repository
-        apt_repository:
-          repo: "deb https://updates.signal.org/desktop/apt xenial main"
-          filename: spotify
-        become: true
-
-      - name: install signal
-        apt:
-          name: signal-desktop
-          update_cache: true
-        become: true
-      when: distro == 'ubuntu'
-      tags: [signal]
-
     - name: create dotfiles group
       group:
         name: dotfiles