Merge branch 'master' of github.com:10sr/dotfiles

bashrc

@@ -136,7 +136,8 @@ alias _reloadrc="test -f ~/.bashrc && source ~/.bashrc"
 alias sh="ENV=$HOME/.shrc PS1=\$\  PROMPT_COMMAND="" sh"
 # type trash >/dev/null 2>&1 && alias rm=trash
 alias mpg123="mpg123 -C -v --title"
-export PLAYER="mpg123 -C -v --title"
+alias xm="xmms2"
+#export PLAYER="mpg123 -C -v --title"
 null type screen && alias screen="screen -e^z^z"
 alias zcd="cd \`zenity --file-selection --directory\`"
 null type gtags && alias gtags="gtags --verbose"

tmux.conf

@@ -5,14 +5,16 @@ set -g prefix C-z
 bind-key C-z send-prefix
 bind-key c command-prompt "new-window '%%'"
 
-setw -g mode-keys vi
 set -g base-index 1
+set -g pane-base-index 1
 
+setw -g mode-keys vi
 set -g default-command /bin/bash
 #set -g default-terminal screen-256color
 #set -g default-terminal screen-16color
 set default-path "${HOME}" # not work as i expected
 set -g set-titles on
+set -g display-panes-time 5000
 
 #set -g status-left ""
 #set -g status-right "#H | %a, %d %b %Y %T %z #(tmux -V)"

vimrc

@@ -64,7 +64,7 @@ filetype plugin indent on
 let g:netrw_liststyle = 1
 let g:netrw_list_hide = '\(^\|\s\s\)\zs\.\S\+'
 
-" i dont use gvimrc
+" for gvim
 if has('gui_running')
     " hide toolbar and scroll bar
     set guioptions-=T