.vim/plugin/tmpwatch.vim: echo -> echoerr

[dotfiles.git] / .xinitrc

diff --git a/.xinitrc b/.xinitrc
index e6fe19f1534c301c84490abe756b5dcbaf9cf3db..f3daa2a064bb00e71c8becb447e75ecada633089 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
@@ -38,7 +50,7 @@ setxkbmap -layout 'us,ru' -variant ',common' -option 'grp:toggle,compose:rctrl,l
 # X settings: shorter beep
 #xset b 50 400 50
 # mouse acceleration
-xset m 5/2
+#xset m 5/2
 # keyboard autorepeat
 xset r on
 # screen saver 5 minutes
@@ -74,9 +86,7 @@ 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