xorg: remove $STARTUP, add uim env if installed, ignore xinput settings errorsHEADmaster

1 files changed, 9 insertions, 3 deletions

diff --git a/xinitrc b/xinitrc
index 33330db..fa8e14d 100644
--- a/xinitrc
+++ b/xinitrc
@@ -12,12 +12,18 @@ setxkbmap \
 	-option 'grp:shifts_toggle,compose:menu'
 xmodmap ~/.us-intl-german.xmodmap
 
+if [ "$(command -v uim-xim >/dev/null >&2)" ]; then
+	export GTK_IM_MODULE="uim"
+	export QT_IM_MODULE="uim"
+	export XMODIFIERS="@im=uim"
+fi
+
 xrdb -merge ~/.Xresources
 xset b off
 
-xinput --set-prop 11 'libinput Accel Speed' -0.7
+xinput --set-prop 'Razer Razer Salmosa' 'libinput Accel Speed' -0.7 >/dev/null 2>&1
 
 # color temperature
-[ $(command -v sct 2>/dev/null) ] && sct 4400
+command -v sct >/dev/null 2>&1 && sct 4400
 
-exec $STARTUP runsvdir -P ~/service.x 'log: ...........................................................................................................................................................................................................................................................................................................................................................................................................'
+exec runsvdir -P ~/service.x 'log: ...........................................................................................................................................................................................................................................................................................................................................................................................................'