Small keyboard-related profile updates/fixes

diff --git a/.config/profiles/jirud b/.config/profiles/jirud
index 28da042..addb53a 100644 (file)
--- a/.config/profiles/jirud
+++ b/.config/profiles/jirud
@@ -1,9 +1,10 @@
-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
+if [ $DISPLAY ]; then
+    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

 fi
 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 e049e00..8f28ffb 100644 (file)
--- a/.config/profiles/langa
+++ b/.config/profiles/langa
@@ -1,7 +1,12 @@
 # export XDG_DATA_DIRS="/usr/share/mate:/usr/local/share/:/usr/share/"
 
 # 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
+if [ $DISPLAY ]; then
+    if [ -x "$(command -v xinput)" ]; then
+        xinput set-prop 'TPPS/2 IBM TrackPoint' 'libinput Accel Speed' -0.4
+    fi
+    setxkbmap \
+        -layout us,ir \
+        -option ctrl:nocaps \
+        -option grp:shifts_toggle
+    xmodmap -e "keysym Menu = Super_R"

 fi
 fi

-
-xmodmap -e "keysym Menu = Super_R"

diff --git a/.local/bin/startup-progs b/.local/bin/startup-progs
index f9b4143..ab1c99f 100755 (executable)
--- a/.local/bin/startup-progs
+++ b/.local/bin/startup-progs
@@ -2,11 +2,6 @@
 
 [ -f ~/.Xresources ] && xrdb -merge ~/.Xresources
 
 
 [ -f ~/.Xresources ] && xrdb -merge ~/.Xresources
 

-# setxkbmap \
-#     -layout us,ir \
-#     -option ctrl:nocaps \
-#     -option grp:shifts_toggle
-

 xsetroot -cursor_name left_ptr
 xset r rate 200 45
 xset b off
 xsetroot -cursor_name left_ptr
 xset r rate 200 45
 xset b off