X-Git-Url: https://git.phdru.name/?p=dotfiles.git;a=blobdiff_plain;f=.xinitrc;h=4a1b23f6b801260d7d164e6f96c4b592be142258;hp=dabbeb0e50615bec5363ee8ec275a9a71f5a28d3;hb=a34bfb1919bca15f01c6d52ccee09119edc3b7d4;hpb=03628d89fc3f4276f738d976a1991105a950d104

diff --git a/.xinitrc b/.xinitrc
index dabbeb0..4a1b23f 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -10,10 +10,6 @@ if xauth list | grep -Fq -- -eth; then
    fi
 elif xauth list | grep -Fq -- -wifi; then
    xauth list | sed -e 's/^/add /' -e 's/-wifi/-eth/' | xauth
-else
-   echo "Unknown xauth info" >&2
-   xauth list
-   exit 1
 fi
 
 PATH="$PATH":/usr/games
@@ -44,9 +40,12 @@ fi
 #    "$OPENWINHOME"/lib/openwin-init    # Default OpenWindows tools
 #fi
 
-# EN/RU, switch on RightAlt, Compose: RightControl, Level3:RightMenu
+# EN/RU, switch on RightAlt and both Shifts,
+# Compose: RightControl, Level3:RightMenu.
 setxkbmap -layout '' -variant '' -option ''
-setxkbmap -layout 'us,ru' -variant ',common' -option 'grp:toggle,compose:rctrl,lv3:menu_switch'
+setxkbmap -layout 'us,ru' -variant ',common' -option 'grp:toggle,grp:shifts_toggle,compose:rctrl,lv3:menu_switch'
+# Terminate X session on Ctrl+Alt+Backspace
+#setxkbmap -option terminate:ctrl_alt_bksp
 
 # adjust key bindings (if any)
 #[ -f "$HOME"/lib/X11/.Xmodmap ] && xmodmap "$HOME"/lib/X11/.Xmodmap