Feat(recode-filenames-recursive): Allow to omit parameters

[dotfiles.git] / .xinitrc

diff --git a/.xinitrc b/.xinitrc
index 7fe7d0fda5a5d5dbdff62020b39759dbfe5b2963..97c72d030ac539a76c7b3449dc72f03586bade38 100644 (file)
--- a/.xinitrc
+++ b/.xinitrc
@@ -1,10 +1,22 @@
 #!/bin/sh
 
+# Add X authorization for all host names
+if xauth list | grep -Fq -- -eth; then
+   if xauth list | grep -Fq -- -wifi; then
+      # Nothing to do
+      :
+   else
+      xauth list | sed -e 's/^/add /' -e 's/-eth/-wifi/' | xauth
+   fi
+elif xauth list | grep -Fq -- -wifi; then
+   xauth list | sed -e 's/^/add /' -e 's/-wifi/-eth/' | xauth
+fi
+
 PATH="$PATH":/usr/games
 
 # Set initial background
 xsetroot -solid DarkCyan
-xli -border darkcyan -center -onroot -quiet -zoom auto "`$HOME/current/projects/xsetbg/print-filename.py`"
+xli -border darkcyan -center -onroot -quiet -zoom auto "`$HOME/current/projects/xsetbg/print-filename.py -e koi8-r`"
 
 # load .Xdefaults/.Xresources
 if [ -f "$HOME"/lib/X11/.Xdefaults ]; then
@@ -28,16 +40,21 @@ 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
+[ -f "$HOME"/lib/X11/.Xmodmap ] && xmodmap "$HOME"/lib/X11/.Xmodmap
 
 # X settings: shorter beep
 #xset b 50 400 50
-# autorepeat
+# mouse acceleration
+#xset m 5/2
+# keyboard autorepeat
 xset r on
 # screen saver 5 minutes
 xset s 300 300
@@ -50,7 +67,7 @@ xscreensaver &
 xbindkeys
 xxkb &
 
-synclient AccelFactor=0.1 MaxDoubleTapTime=80 MaxSpeed=1 RightEdge=5000 \
+synclient AccelFactor=0.1 MaxDoubleTapTime=80 MaxSpeed=1 RightEdge=3350 \
    TapButton1=1 TapButton2=2 TapButton3=3 HorizEdgeScroll=1 VertEdgeScroll=1
 
 # Turn mouse off on keyboard activity; turn it back on after 1 second
@@ -59,10 +76,16 @@ synclient AccelFactor=0.1 MaxDoubleTapTime=80 MaxSpeed=1 RightEdge=5000 \
 # start a small console shell
 #xterm -C -geometry 80x8-0+0 -n Console -T Consle -ls +ut -fn 6x10 &
 
-#WIDTH=1024: 85x85+400+1
-#WIDTH=1600: 100x100+600+1
-#WIDTH=1920: 150x150+880+1
-xclock -geometry 100x100+600+1 -bg white -update 1 &
+screen_width=`xrandr --current | head -1 | awk '{print $8}'`
+if [ $screen_width = 1024 ]; then
+   xclcok_geom=85x85+400+1
+elif [ $screen_width = 1600 ]; then
+   xclcok_geom=100x100+600+1
+elif [ $screen_width = 1920 ]; then
+   xclcok_geom=150x150+880+1
+fi
+test -n "$xclcok_geom" && xclock -geometry $xclcok_geom -bg white -update 1 &
+unset screen_width xclcok_geom
 
 # multi-biff
 #xbuffy -fn '-*-helvetica-bold-r-*-*-*-100-*-*-*-*-koi8-r' -geometry +0+125 -boxfile mail/misc/.xbuffyrc &
@@ -72,11 +95,9 @@ if [ -z "$WINDOW_MANAGER" ]; then
    export WINDOW_MANAGER
 fi
 
-gpg-agent --daemon --write-env-file "$HOME"/.gnupg/agent-info \
-   dbus-launch --exit-with-session \
-      "$WINDOW_MANAGER"
+dbus-launch --exit-with-session gpg-agent --daemon "$WINDOW_MANAGER"
 
 # Stop pulseaudio, xscreensaver and xsetbg.py
-pulseaudio -k
+pulseaudio --kill
 xscreensaver-command -exit &
 "$HOME"/current/projects/xsetbg/xsetbg-http-stop &