 +    return 0
 +} &&
 +complete -F __qrefresh_to qrefresh-to
-+
-+__fab_tasks() {
-+    local prev cur
-+    _get_comp_words_by_ref cur prev
-+    COMPREPLY=( $( compgen -W "`fab -l -F short`" -- "$cur" ) )
-+    return 0
-+} &&
-+complete -F __fab_tasks fab
-+
-+__svial() {
-+    local prev cur
-+    _get_comp_words_by_ref cur prev
-+    COMPREPLY=( $( compgen -W "`find $HOME/.vim/sessions -mindepth 1 -type d | xargs --replace=^ basename ^`" -- "$cur"  ) )
-+    return 0
-+}
-+complete -F __svial svial
- 
- export PATH=$HOME/bin:$PATH
- export PROMPT_COMMAND=
-@@ -22,22 +53,23 @@ shopt -s histappend
- 
- export PAGER=most
- export EDITOR=vim
--
--export TERM=xterm-256color
--
--export PIP_DOWNLOAD_CACHE=~/.cache/pip
--export MPD_HOST=~/.mpd/socket
--
- export GIT_PS1_SHOWDIRTYSTATE=1
- export GIT_PS1_SHOWUNTRACKEDFILES=1
+ 
+ __fab_tasks() {
+     local prev cur
+@@ -52,9 +44,33 @@ __svial() {
+ }
+ complete -F __svial svial
+ 
+-export SDL_AUDIODRIVER=alsa
++export PATH=$HOME/bin:$PATH
++export PROMPT_COMMAND=
++export HISTCONTROL=ignoredups
++export HISTFILESIZE=5000
++export HISTSIZE=5000
++shopt -s histappend
++
++export PAGER=most
++export EDITOR=vim
++export GIT_PS1_SHOWDIRTYSTATE=1
++export GIT_PS1_SHOWUNTRACKEDFILES=1
 +export TERM=xterm-256color
  
--_xfunc git __git_ps1 &>/dev/null
--for fname in ~/.bash_sources/*; do
--    . $fname
--done
--
--export SDL_AUDIODRIVER=alsa
 +export PIP_DOWNLOAD_CACHE=~/.cache/pip
- 
++
 +export LOGIBOX_SSH_KEY=/home/bobrov/.ssh/lb_rsa
  export VIRTUALENVWRAPPER_PYTHON=/usr/bin/python2
+ export PYTHONSTARTUP="$HOME/work/python-shell-enhancement/pythonstartup.py"
  
 +#_xfunc git __git_ps1 &>/dev/null
 +



---
 .Xdefaults                            |   10 ++----
 .bash_profile                         |   10 +++++-
 .bashrc                               |   58 ++++++++++++++++++++++++++-------
 .config/openbox/rc.xml                |   18 +++-------
 .config/orcsome/rc.py                 |   31 +++---------------
 .gtkrc-2.0.mine                       |   17 +++++++++-
 .mplayer/config                       |   38 +---------------------
 .vimrc                                |   14 +++++++-
 .xinitrc                              |    8 ++---
 bin/box-session.sh                    |    4 ++
 bin/check-mail                        |    2 +
 bin/git-pull-all                      |   10 +++++-
 bin/rx                                |    2 +
 bin/xxx                               |    2 +
 etc/X11/xorg.conf.d/50-joystick.conf  |    6 +++
 etc/X11/xorg.conf.d/50-synaptics.conf |   53 ++++++++++++++++++++++++++----
 etc/X11/xorg.conf.d/50-vmmouse.conf   |    7 ++++
 etc/asound.conf                       |   17 +++-------
 18 files changed, 178 insertions(+), 129 deletions(-)
 create mode 100644 etc/X11/xorg.conf.d/50-joystick.conf
 create mode 100644 etc/X11/xorg.conf.d/50-vmmouse.conf


-
-[gnome-mplayer]
-msglevel=all=5
diff --git a/.xinitrc b/.xinitrc
index cc2200c..b0b85c4 100644
--- a/.xinitrc
