From 304edf080d65dad148ab6246d9fcf072ba7e86c2 Mon Sep 17 00:00:00 2001
From: "jakob.stendahl" <jakob.stendahl@infomedia.dk>
Date: Fri, 9 Feb 2024 11:52:25 +0100
Subject: some things

---
 linux/sway/autostart    | 37 -------------------------------------
 linux/sway/autostart.m4 | 42 ++++++++++++++++++++++++++++++++++++++++++
 linux/sway/hid          | 31 -------------------------------
 linux/sway/hid.m4       | 33 +++++++++++++++++++++++++++++++++
 4 files changed, 75 insertions(+), 68 deletions(-)
 delete mode 100644 linux/sway/autostart
 create mode 100644 linux/sway/autostart.m4
 delete mode 100644 linux/sway/hid
 create mode 100644 linux/sway/hid.m4

(limited to 'linux/sway')

diff --git a/linux/sway/autostart b/linux/sway/autostart
deleted file mode 100644
index 3e53a79..0000000
--- a/linux/sway/autostart
+++ /dev/null
@@ -1,37 +0,0 @@
-# Fix GTK+ application slow start
-exec dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK
-
-# screen locking
-exec swayidle -w \
-              timeout 300 'swaymsg "output * dpms off"' \
-              timeout 3600 physlock \
-              resume 'swaymsg "output * dpms on"' \
-              before-sleep physlock
-
-# notification centre
-exec swaync
-
-# system tray applets
-exec blueman-applet
-exec udiskie
-exec nm-applet --indicator
-
-# Wayland Overlay Bar, volume/brigtness bar
-set $WOBSOCK $XDG_RUNTIME_DIR/wob.sock
-exec rm -f $WOBSOCK && mkfifo $WOBSOCK && tail -f $WOBSOCK | wob
-
-# use clipman for clipboard management
-exec wl-paste -t text --watch clipman store --no-persist
-
-# Nice color hues in the evenings
-exec wlsunset -l 59.9614 -L 10.925 -t 4500 -T 6500 -g 1.0
-
-# start nextcloud
-exec_always nextcloud --background
-
-# gnome keyring daemon
-exec_always eval $(gnome-keyring-daemon --start)
-exec_always export SSH_AUTH_SOCK
-
-# IME
-exec_always fcitx5 -d
diff --git a/linux/sway/autostart.m4 b/linux/sway/autostart.m4
new file mode 100644
index 0000000..ae49261
--- /dev/null
+++ b/linux/sway/autostart.m4
@@ -0,0 +1,42 @@
+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, {2}, {m4_dnl
+exec swayidle -w \
+              timeout 300 'swaymsg "output * dpms off"' \
+              timeout 3600 physlock \
+              resume 'swaymsg "output * dpms on"' \
+              before-sleep physlock
+})m4_dnl
+m4_changequote(`, ')m4_dnl
+
+# notification centre
+exec swaync
+
+# system tray applets
+exec blueman-applet
+exec udiskie
+exec nm-applet --indicator
+
+# Wayland Overlay Bar, volume/brigtness bar
+set $WOBSOCK $XDG_RUNTIME_DIR/wob.sock
+exec rm -f $WOBSOCK && mkfifo $WOBSOCK && tail -f $WOBSOCK | wob
+
+# use clipman for clipboard management
+exec wl-paste -t text --watch clipman store --no-persist
+
+# Nice color hues in the evenings
+exec wlsunset -l 59.9614 -L 10.925 -t 4500 -T 6500 -g 1.0
+
+# start nextcloud
+exec_always nextcloud --background
+
+# gnome keyring daemon
+exec_always eval $(gnome-keyring-daemon --start)
+exec_always export SSH_AUTH_SOCK
+
+# IME
+exec_always fcitx5 -d
diff --git a/linux/sway/hid b/linux/sway/hid
deleted file mode 100644
index 23ad103..0000000
--- a/linux/sway/hid
+++ /dev/null
@@ -1,31 +0,0 @@
-output eDP-1 {
-    scale 1.4
-}
-
-input "type:keyboard" {
-  xkb_layout us,no
-  repeat_delay 300
-  repeat_rate 40
-  xkb_capslock disabled
-  xkb_numlock disabled
-}
-
-input "type:touchpad" {
-  pointer_accel 0.0
-  natural_scroll enabled
-  scroll_factor 1.0
-  scroll_method two_finger
-  left_handed disabled
-  tap enabled
-  tap_button_map lrm
-  drag enabled
-  drag_lock disabled
-  dwt enabled
-  middle_emulation enabled
-}
-
-input "type:pointer" {
-  natural_scroll disabled
-  scroll_factor 1.0
-  left_handed disabled
-}
diff --git a/linux/sway/hid.m4 b/linux/sway/hid.m4
new file mode 100644
index 0000000..762be21
--- /dev/null
+++ b/linux/sway/hid.m4
@@ -0,0 +1,33 @@
+m4_include(`system.m4')m4_dnl
+
+output eDP-1 {
+    scale m4_ifelse(SYSID, `1', `1.4', `1.0')
+}
+
+input "type:keyboard" {
+  xkb_layout us,no
+  repeat_delay 300
+  repeat_rate 40
+  xkb_capslock disabled
+  xkb_numlock disabled
+}
+
+input "type:touchpad" {
+  pointer_accel 0.0
+  natural_scroll enabled
+  scroll_factor 1.0
+  scroll_method two_finger
+  left_handed disabled
+  tap enabled
+  tap_button_map lrm
+  drag enabled
+  drag_lock disabled
+  dwt enabled
+  middle_emulation enabled
+}
+
+input "type:pointer" {
+  natural_scroll disabled
+  scroll_factor 1.0
+  left_handed disabled
+}
-- 
cgit v1.2.3