From bf5df2e802df4a46378855fd7ef0b0a4979d8c27 Mon Sep 17 00:00:00 2001
From: jakobst1n <jakob.stendahl@outlook.com>
Date: Mon, 12 Feb 2024 18:00:19 +0100
Subject: Improve some config stuff

---
 linux/sway/autostart.m4 | 3 +--
 linux/sway/config.m4    | 3 +--
 linux/sway/hid.m4       | 4 +---
 3 files changed, 3 insertions(+), 7 deletions(-)

(limited to 'linux/sway')

diff --git a/linux/sway/autostart.m4 b/linux/sway/autostart.m4
index 68045e2..828fe06 100644
--- a/linux/sway/autostart.m4
+++ b/linux/sway/autostart.m4
@@ -1,10 +1,9 @@
-m4_include(`system.m4')m4_dnl
 # Fix GTK+ application slow start
 exec dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK
 
 # screen locking
 m4_changequote({, })m4_dnl
-m4_ifelse(SYSID, {1}, {m4_dnl
+m4_ifelse(DT_SYSID, {1}, {m4_dnl
 #exec swayidle -w \
 #              timeout 300 'swaymsg "output * dpms off"' \
 #              timeout 3600 physlock \
diff --git a/linux/sway/config.m4 b/linux/sway/config.m4
index 60f9d06..cba1ae2 100644
--- a/linux/sway/config.m4
+++ b/linux/sway/config.m4
@@ -1,4 +1,3 @@
-m4_include(`system.m4')m4_dnl
 include autostart
 include hid
 
@@ -48,7 +47,7 @@ bindsym $Mod+Return       exec alacritty
 bindsym $Mod+w            exec firefox
 bindsym $Mod+f            exec thunar
 bindsym $Mod+c            exec swaync-client -t
-bindsym Mod1+l            exec m4_ifelse(SYSID, `2', `nwg-lock', physlock)
+bindsym Mod1+l            exec m4_ifelse(DT_SYSID, `2', `nwg-lock', physlock)
 bindsym $Mod+d            exec wofi --show=drun
 
 # Exit menu
diff --git a/linux/sway/hid.m4 b/linux/sway/hid.m4
index 762be21..b420f94 100644
--- a/linux/sway/hid.m4
+++ b/linux/sway/hid.m4
@@ -1,7 +1,5 @@
-m4_include(`system.m4')m4_dnl
-
 output eDP-1 {
-    scale m4_ifelse(SYSID, `1', `1.4', `1.0')
+    scale m4_ifelse(DT_SYSID, `1', `1.4', `1.0')
 }
 
 input "type:keyboard" {
-- 
cgit v1.2.3