From 9c11f4b3575f7276379351cce540623863bb31b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20K=C3=B6rber?= <hannes@hkoerber.de>
Date: Fri, 29 Oct 2021 17:44:20 +0200
Subject: [PATCH] Remove discord

---
 _machines/ares.yml                 | 1 -
 autostart/autostart.target.j2      | 1 -
 autostart/services/discord.service | 9 ---------
 i3/config.j2                       | 1 -
 packages.yml                       | 6 +++---
 zsh/zprofile.j2                    | 1 -
 6 files changed, 3 insertions(+), 16 deletions(-)
 delete mode 100644 autostart/services/discord.service

diff --git a/_machines/ares.yml b/_machines/ares.yml
index 258ed11..7f0f354 100644
--- a/_machines/ares.yml
+++ b/_machines/ares.yml
@@ -52,7 +52,6 @@ environment:
   MACHINE_HAS_KEEPASSX: "false"
   MACHINE_HAS_NEXTCLOUD: "true"
   MACHINE_HAS_STEAM: "true"
-  MACHINE_HAS_DISCORD: "true"
   MACHINE_HAS_RESTIC_BACKUP: "false"
   MACHINE_HAS_ELEMENT: "true"
   MACHINE_RESOLUTION_X: "2560"
diff --git a/autostart/autostart.target.j2 b/autostart/autostart.target.j2
index 9e29730..6f5f77c 100644
--- a/autostart/autostart.target.j2
+++ b/autostart/autostart.target.j2
@@ -3,7 +3,6 @@ BindsTo=windowmanager.target
 After=windowmanager.target
 
 Wants=blueman.service
-#Wants=discord.service
 Wants=dpms.service
 Wants=dunst.service
 Wants=element.service
diff --git a/autostart/services/discord.service b/autostart/services/discord.service
deleted file mode 100644
index f7cd780..0000000
--- a/autostart/services/discord.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-BindsTo=autostart.target
-After=windowmanager.target
-
-ConditionPathExists=%h/.var/run/features/discord
-
-[Service]
-ExecStart=/usr/bin/env discord
-PassEnvironment=DISPLAY
diff --git a/i3/config.j2 b/i3/config.j2
index 51f8af5..d08fa38 100644
--- a/i3/config.j2
+++ b/i3/config.j2
@@ -120,7 +120,6 @@ assign [class="^Spotify$"] $workspace9
 
 assign [class="^Google-chrome$"] $workspace7
 assign [class="^Chromium$"] $workspace7
-assign [class="^discord"] $workspace7
 assign [class="^Steam"] $workspace5
 for_window [class="^Steam$"] move to workspace $workspace5
 
diff --git a/packages.yml b/packages.yml
index 538dbf0..fa3d5b1 100644
--- a/packages.yml
+++ b/packages.yml
@@ -329,9 +329,6 @@ packages:
     man:
       ubuntu: ["man-db", "manpages"]
       archlinux: ["man-db", "man-pages"]
-    discord:
-      ubuntu: []
-      archlinux: ["discord"]
     nextcloud:
       ubuntu: ["nextcloud-desktop"]
       archlinux: ["nextcloud-client"]
@@ -394,3 +391,6 @@ packages:
     vim:
       ubuntu: ["vim"]
       archlinux: ["gvim"]
+    discord:
+      ubuntu: []
+      archlinux: ["discord"]
diff --git a/zsh/zprofile.j2 b/zsh/zprofile.j2
index 84db519..d6259c6 100644
--- a/zsh/zprofile.j2
+++ b/zsh/zprofile.j2
@@ -53,7 +53,6 @@ mkdir -p "${FEATURE_DIR}"
 [[ $MACHINE_HAS_NEXTCLOUD     == "true" ]] && touch "${FEATURE_DIR}"/nextcloud
 [[ $MACHINE_HAS_KEEPASSX      == "true" ]] && touch "${FEATURE_DIR}"/keepassx
 [[ $MACHINE_HAS_STEAM         == "true" ]] && touch "${FEATURE_DIR}"/steam
-[[ $MACHINE_HAS_DISCORD       == "true" ]] && touch "${FEATURE_DIR}"/discord
 [[ $MACHINE_HAS_RESTIC_BACKUP == "true" ]] && touch "${FEATURE_DIR}"/restic_backup
 [[ $MACHINE_HAS_ELEMENT       == "true" ]] && touch "${FEATURE_DIR}"/element