From 7dd9938023b620a4e65b57a50d5414ac577abf0c Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Mon, 18 Oct 2021 23:50:30 -0400
Subject: [PATCH] move some machine-specific keyboard settings to their
 respective profile

---
 .config/profiles/jirud     |  9 +++++++++
 .config/profiles/langa     |  6 ++++++
 .local/bin/set-up-keyboard |  1 -
 .local/bin/startup-progs   | 13 -------------
 4 files changed, 15 insertions(+), 14 deletions(-)
 create mode 100644 .config/profiles/jirud

diff --git a/.config/profiles/jirud b/.config/profiles/jirud
new file mode 100644
index 0000000..28da042
--- /dev/null
+++ b/.config/profiles/jirud
@@ -0,0 +1,9 @@
+if [ -x "$(command -v xinput)" ]; then
+    xinput set-prop 'DLL07BE:01 06CB:7A13 Touchpad' 'libinput Natural Scrolling Enabled' 1
+    xinput set-prop 'DLL07BE:01 06CB:7A13 Touchpad' 'libinput Click Method Enabled' 0 1
+fi
+
+setxkbmap \
+    -layout us,ir \
+    -option ctrl:swap_rwin_rctl \
+    -option grp:shifts_toggle
diff --git a/.config/profiles/langa b/.config/profiles/langa
index f497c44..e049e00 100644
--- a/.config/profiles/langa
+++ b/.config/profiles/langa
@@ -1 +1,7 @@
 # export XDG_DATA_DIRS="/usr/share/mate:/usr/local/share/:/usr/share/"
+
+if [ -x "$(command -v xinput)" ]; then
+    xinput set-prop 'TPPS/2 IBM TrackPoint' 'libinput Accel Speed' -0.4
+fi
+
+xmodmap -e "keysym Menu = Super_R"
diff --git a/.local/bin/set-up-keyboard b/.local/bin/set-up-keyboard
index 90c636b..0eb9bf1 100755
--- a/.local/bin/set-up-keyboard
+++ b/.local/bin/set-up-keyboard
@@ -1,4 +1,3 @@
 setxkbmap \
     -layout us,ir \
-    -option ctrl:swap_rwin_rctl \
     -option grp:shifts_toggle
diff --git a/.local/bin/startup-progs b/.local/bin/startup-progs
index 746b023..f9b4143 100755
--- a/.local/bin/startup-progs
+++ b/.local/bin/startup-progs
@@ -2,24 +2,11 @@
 
 [ -f ~/.Xresources ] && xrdb -merge ~/.Xresources
 
-if [ -x "$(command -v xinput)" ]; then
-    xinput set-prop 'TPPS/2 IBM TrackPoint' 'libinput Accel Speed' -0.4
-    xinput set-prop 'DLL07BE:01 06CB:7A13 Touchpad' 'libinput Natural Scrolling Enabled' 1
-    xinput set-prop 'DLL07BE:01 06CB:7A13 Touchpad' 'libinput Click Method Enabled' 0 1
-fi
-
 # setxkbmap \
 #     -layout us,ir \
 #     -option ctrl:nocaps \
 #     -option grp:shifts_toggle
 
-setxkbmap \
-    -layout us,ir \
-    -option ctrl:swap_rwin_rctl \
-    -option grp:shifts_toggle
-
-xmodmap -e "keysym Menu = Super_R"
-
 xsetroot -cursor_name left_ptr
 xset r rate 200 45
 xset b off
-- 
2.20.1