From 613f249f64b16cd12e24d3d3974345f8d1c8b372 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20K=C3=B6rber?= <hannes.koerber@tradebyte.com>
Date: Wed, 27 Jan 2021 16:37:42 +0100
Subject: [PATCH] Remove old screencfg config

---
 _machines/ares.yml                   | 1 -
 autostart/services/screencfg.service | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/_machines/ares.yml b/_machines/ares.yml
index 8529c85..ef313cf 100644
--- a/_machines/ares.yml
+++ b/_machines/ares.yml
@@ -41,6 +41,5 @@ environment:
   MACHINE_HAS_STEAM: "true"
   MACHINE_HAS_DISCORD: "true"
   MACHINE_HAS_RESTIC_BACKUP: "false"
-  MACHINE_DEFAULT_SCREENPROFILE: "ares"
   MACHINE_RESOLUTION_X: "2560"
   MACHINE_RESOLUTION_Y: "1440"
diff --git a/autostart/services/screencfg.service b/autostart/services/screencfg.service
index b27aa6c..90d9357 100644
--- a/autostart/services/screencfg.service
+++ b/autostart/services/screencfg.service
@@ -1,7 +1,6 @@
 [Unit]
 BindsTo=autostart.target
 After=windowmanager.target
-ConditionEnvironment=MACHINE_DEFAULT_SCREENPROFILE
 
 [Service]
 Type=oneshot
@@ -9,6 +8,6 @@ Type=oneshot
 
 # > The command to execute may contain spaces, but control characters are not
 # > allowed.
-ExecStart=/usr/bin/env bash -c '%h/.screencfg/${MACHINE_DEFAULT_SCREENPROFILE}.sh'
+ExecStart=/usr/bin/env screencfg "%h/.screencfg/%H/default.yml"
 RemainAfterExit=true
 Environment=DISPLAY=:0