Add tmux.conf, clean up

3 files changed, 27 insertions, 8 deletions

diff --git a/install b/install
index ac80948..64e643c 100755
--- a/install
+++ b/install
@@ -6,7 +6,7 @@ cd $(dirname $BASH_SOURCE)
 BASE=$(pwd)
 
 # dotfiles to install
-for dotfile in bashrc vimrc; do
+for dotfile in bashrc vimrc tmux.conf; do
   mkdir -pv bak  
   [ -e ~/.$dotfile ] && mv -v ~/.$dotfile bak/.$dotfile
   ln -sfv $BASE/$dotfile ~/.$dotfile
diff --git a/tmux.conf b/tmux.conf
new file mode 100644
index 0000000..8e1fa67
--- /dev/null
+++ b/tmux.conf
@@ -0,0 +1,22 @@
+# Use <C-a> instead of the default <C-b> as Tmux prefix
+set-option -g prefix C-a
+unbind-key C-b
+bind-key C-a send-prefix
+
+set -g terminal-overrides 'xterm*:smcup@:rmcup@'
+
+# Mouse support disabled, depends on tmux version
+#set -g mouse-utf8 on
+#set -g mouse on
+bind -n WheelUpPane copy-mode
+
+# Act more like vim:
+set-window-option -g mode-keys vi
+bind h select-pane -L
+bind j select-pane -D
+bind k select-pane -U
+bind l select-pane -R
+unbind p
+bind p paste-buffer
+bind -t vi-copy v begin-selection
+bind -t vi-copy y copy-selection
diff --git a/vimrc b/vimrc
index aab6f47..b18e91b 100644
--- a/vimrc
+++ b/vimrc
@@ -21,9 +21,9 @@ Plug 'hrp/EnhancedCommentify'
 Plug 'jalvesaq/R-Vim-runtime'
 Plug 'jranke/vim-pandoc', { 'branch': 'rmd' }
 Plug 'vim-pandoc/vim-pandoc-syntax'
-
+" R plugin {{{2
 if !exists("*job_getchannel")
-  " for vim versions <= 7.4.1453 use the legacy plugin not maintained any more
+  " for vim versions <= 7.4.1453 use the legacy plugin
   Plug 'jcfaria/Vim-R-plugin', { 'commit': 'd726d619f12a10fb5ac7967d373837735cff60f0' }
   "let vimrplugin_vsplit = 0
   "let vimrplugin_rconsole_width = 100
@@ -44,6 +44,7 @@ else
   let R_vsplit = 1
   let R_assign = 0
 endif
+" 2}}}
 
 call plug#end()
 
@@ -51,11 +52,6 @@ call plug#end()
 let r_syntax_folding = 0
 let rmd_syn_hl_chunk = 1
 
-" Search {{{1
-set infercase
-"set hlsearch
-set incsearch
-
 " Showmarks {{{1
 let marksCloseWhenSelected = 0
 let showmarks_include="abcdefghijklmnopqrstuvwxyz"
@@ -86,6 +82,7 @@ let pandoc#folding#fdc=0
 let pandoc#syntax#conceal#use=0
 
 " Show syntax highlighting under the cursor {{{1
+" More info available via mapping zS from tpope/vim-scriptease
 " http://vim.wikia.com/wiki/Identify_the_syntax_highlighting_group_used_at_the_cursor
 map <F10> :echo "hi<" . synIDattr(synID(line("."),col("."),1),"name") . '> trans<'
       \ . synIDattr(synID(line("."),col("."),0),"name") . "> lo<"