From e94d0ea6f66b4084ea3ed8dceddab2ee680dbe74 Mon Sep 17 00:00:00 2001
From: Dan Buch <dan@meatballhat.com>
Date: Thu, 21 Apr 2022 11:40:29 -0400
Subject: [PATCH] Making messes with xinput and minirc

---
 config/xinit_functions.sh | 31 +++++++++++++++++++++++++++++++
 minirc.dfl                |  7 +++++++
 xinitrc                   | 16 ++++------------
 3 files changed, 42 insertions(+), 12 deletions(-)
 create mode 100644 config/xinit_functions.sh
 create mode 100644 minirc.dfl

diff --git a/config/xinit_functions.sh b/config/xinit_functions.sh
new file mode 100644
index 0000000..2976963
--- /dev/null
+++ b/config/xinit_functions.sh
@@ -0,0 +1,31 @@
+function _xinit_setup_xinput() {
+  if ! xinput list >/dev/null; then
+    return
+  fi
+
+  _xinit_setup_xinput_touchpad
+  _xinit_setup_xinput_trackman_marble
+}
+
+function _xinit_setup_xinput_touchpad() {
+  if ! xinput list-props 'Elan Touchpad' >/dev/null; then
+    return
+  fi
+
+  xinput set-prop 'Elan Touchpad' \
+    'libinput Natural Scrolling Enabled' 1
+}
+
+function _xinit_setup_xinput_trackman_marble() {
+  if ! xinput list-props 'Logitech USB Trackball' >/dev/null; then
+    return
+  fi
+
+  xinput set-button-map \
+    'Logitech USB Trackball' \
+    1 2 3 4 5 6 7 8 9
+  xinput set-prop \
+    'Logitech USB Trackball' \
+    'libinput Scroll Method Enabled' \
+    0, 0, 1
+}
diff --git a/minirc.dfl b/minirc.dfl
new file mode 100644
index 0000000..2c46c23
--- /dev/null
+++ b/minirc.dfl
@@ -0,0 +1,7 @@
+pu baudrate 115200
+pu bits 8
+pu parity N
+pu stopbits 1
+pu rtscts No
+pu xonxoff No
+
diff --git a/xinitrc b/xinitrc
index b3be680..184f420 100644
--- a/xinitrc
+++ b/xinitrc
@@ -1,21 +1,13 @@
 # vim:filetype=bash:expandtab:ts=2:sts=2
 setxkbmap dvorak
 
-function _xinit_setup_xinput() {
-  if ! xinput list &>/dev/null; then
-    return
-  fi
-
-  if ! xinput list-props 'Elan Touchpad' &>/dev/null; then
-    return
-  fi
-
-  xinput set-prop 'Elan Touchpad' \
-    'libinput Natural Scrolling Enabled' 1
-}
+. ~/.config/xinit_functions.sh
 
 _xinit_setup_xinput
 
 eval "$(ssh-agent)"
 
+if [ -n "${WM}" ]; then
+  exec "${WM}"
+fi
 exec leftwm