refactoring

15 files changed, 238 insertions, 148 deletions

diff --git a/.Xcommon b/.Xcommon
new file mode 100644
index 0000000..314cfd8
--- /dev/null
+++ b/.Xcommon
@@ -0,0 +1,20 @@
+! dotfiles -- .Xcommon
+! author: johannst
+
+!xterm*font: 9x15
+!XTerm*renderFont: true
+!XTerm*faceName: Vera Serif Mono
+!XTerm*faceName: Liberation Mono
+!XTerm*faceName: Droid Sans Mono 
+xterm*faceName: Terminess Powerline
+xterm*faceSize: 12
+
+XTerm*scaleHeight: 1.1
+xterm*metaSendsEscape: true
+xterm*saveLines: 16384
+xterm*loginShell: true
+xterm*charClass: 33:48,35:48,37:48,43:48,45-47:48,64:48,95:48,126:48
+xterm*termName: xterm-256color
+xterm*eightBitInput: false
+XTerm*selectToClipboard: true
+XTerm*visualBell: false
diff --git a/.Xresources_gray b/.Xresources_gray
index 54eb7b8..4c2ea62 100644
--- a/.Xresources_gray
+++ b/.Xresources_gray
@@ -1,23 +1,10 @@
 ! dotfiles -- .Xresources_gray
 ! author: johannst
 
-!xterm*font: 9x15
-xterm*faceName: Terminess Powerline
-xterm*faceSize: 12
-
-XTerm*scaleHeight: 1.1
-xterm*metaSendsEscape: true
-xterm*saveLines: 16384
-xterm*loginShell: true
-xterm*charClass: 33:48,35:48,37:48,43:48,45-47:48,64:48,95:48,126:48
-xterm*termName: xterm-256color
-xterm*eightBitInput: false
-XTerm*selectToClipboard: true
-
-! --- ~/.Xresources ------------------------------------------------------------
+#include ".Xcommon"
+
 ! ------------------------------------------------------------------------------
 ! --- generated with 4bit Terminal Color Scheme Designer -----------------------
-! ------------------------------------------------------------------------------
 ! --- http://ciembor.github.com/4bit -------------------------------------------
 ! ------------------------------------------------------------------------------
 
@@ -75,11 +62,3 @@ XTerm*selectToClipboard: true
 
 ! bright_white
 *color15: #ffffff
-
-
-! ------------------------------------------------------------------------------
-! --- end of terminal colors section -------------------------------------------
-! ------------------------------------------------------------------------------
-
-
-
diff --git a/.Xresources_solarized b/.Xresources_solarized
index d7dee7b..3995ec1 100644
--- a/.Xresources_solarized
+++ b/.Xresources_solarized
@@ -1,20 +1,7 @@
 ! dotfiles -- .Xresources_solarized
 ! author: johannst
 
-!XTerm*renderFont: true
-!XTerm*faceName: Vera Serif Mono
-!XTerm*faceName: Liberation Mono
-!XTerm*faceName: Droid Sans Mono 
-!XTerm*faceSize: 10
-xterm*font : 9x15
-XTerm*scaleHeight: 1.1
-xterm*metaSendsEscape: true
-xterm*saveLines: 16384
-xterm*loginShell: true
-xterm*charClass: 33:48,35:48,37:48,43:48,45-47:48,64:48,95:48,126:48
-xterm*termName: xterm-256color
-xterm*eightBitInput: false
-XTerm*selectToClipboard: true
+#include ".Xcommon"
 
 ! blue - gray mix with different brightness
 ! S_base03    ^                
diff --git a/.conkyrc b/.conkyrc
new file mode 100755
index 0000000..b4b586d
--- /dev/null
+++ b/.conkyrc
@@ -0,0 +1,93 @@
+# dotfiles -- .conkyrc
+# author: johannst
+
+background yes 
+use_xft yes
+xftfont Bitstream Vera Sans Mono:size=9
+xftalpha 0.8
+update_interval 2.0
+total_run_times 0
+own_window yes
+own_window_type normal
+own_window_transparent yes
+own_window_colour black
+own_window_hints undecorated,skip_pager,skip_taskbar
+double_buffer yes
+minimum_size 260 5
+draw_shades no
+draw_outline no
+draw_borders no
+draw_graph_borders no
+stippled_borders 0
+border_margin 4
+border_width 0
+default_color white
+default_shade_color black
+default_outline_color black
+alignment top_right
+gap_x 0
+gap_y 25
+no_buffers yes
+uppercase no
+cpu_avg_samples 1
+net_avg_samples 1
+override_utf8_locale no
+use_spacer yes
+mpd_host localhost 
+mpd_portPort 6060
+#mpd_password 
+
+TEXT
+#############################################################
+# CPU                                                       #
+#############################################################
+${font Verdana:style=Bold:size=16}${color #75C8ff}${alignc}${time %a %d. %b %k:%M}
+$font$color${alignc}Kernel: $kernel
+${color #75C8ff}$stippled_hr
+
+#############################################################
+# POWER                                                     #
+#############################################################
+${color lightgrey}Power: ${battery_short BAT0} ${battery_time BAT0} ${battery_bar BAT0}
+
+#############################################################
+# CPU                                                       #
+#############################################################
+${color lightgrey}Processes:$color $processes  ${color grey}Running:$color $running_processes ${color lightgrey}Up:$color $uptime 
+#(cpu 0)=total util (cpuX)=util core X [here X=1,2,3,4]
+${color #75C8ff}CPU: ${cpu cpu0}% ${cpubar}
+${color}Name              PID     CPU%   MEM%
+${font Monospace:size=8}${color lightgrey}${top name 1}     ${top pid 1}  ${top cpu 1}  ${top mem 1}
+${color lightgrey}${top name 2}     ${top pid 2}  ${top cpu 2}  ${top mem 2}
+${color lightgrey}${top name 3}     ${top pid 3}  ${top cpu 3}  ${top mem 3}
+
+${font Monospace:size=8}${color}core0                       core1   
+${cpugraph cpu1 30,160 0032bc 75C8ff} ${cpugraph cpu2 30,160 0032bc 75C8ff}
+${font Monospace:size=8}${color}core2                       core3
+${cpugraph cpu3 30,160 0032bc 75C8ff} ${cpugraph cpu4 30,160 0032bc 75C8ff}
+
+#############################################################
+# MEMORY                                                    #
+#############################################################
+$font${color #75C8ff}RAM: $mem/$memmax - $memperc% ${membar}
+${color lightgrey}Swap: $swap/$swapmax - $swapperc% ${swapbar}
+${color}Name              PID     CPU%   MEM%
+${font Monospace:size=8}${color lightgrey}${top_mem name 1}     ${top_mem pid 1}  ${top_mem cpu 1}  ${top_mem mem 1}
+${color lightgrey}${top_mem name 2}     ${top_mem pid 2}  ${top_mem cpu 2}  ${top_mem mem 2}
+${color lightgrey}${top_mem name 3}     ${top_mem pid 3}  ${top_mem cpu 3}  ${top_mem mem 3}
+
+#############################################################
+# NETWORK                                                   #
+#############################################################
+$font${color #75C8ff}Connections${alignr}${color #75C8ff}In:$color ${tcp_portmon 1 32767 count}  ${color #75C8ff}Out:$color ${tcp_portmon 32768 61000 count}   ${color #75C8ff}ALL:$color ${tcp_portmon 1 65535 count}
+${color lightgrey}$stippled_hr
+${color lightgrey}Down:$color ${downspeedf wlp3s0} k/s${color lightgrey} ${offset 40}Up:$color ${upspeedf wlp3s0} k/s
+${downspeedgraph wlp3s0 32,120 75C8ff ffffff} ${offset 40} ${upspeedgraph wlp3s0 32,120 75C8ff ffffff}
+#${color #75C8ff}IPs:$color ${addr wlp3s0} ${offset 40} ${execi 7200 ~/.conky/publicip.sh}
+${color lightgrey}$stippled_hr
+
+#############################################################
+# HDD                                                       #
+#############################################################
+${color lightgrey}system:  ${fs_used /}/${fs_size /} free:${fs_free_perc /}% ${fs_bar /}
+${color lightgrey}home: ${fs_used /home}/${fs_size /home}  free:${fs_free_perc /home}% ${fs_bar /home}
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..c832b52
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.cgdb/readline_history.txt
diff --git a/.tmux.conf b/.tmux.conf
index 343cf07..4446c03 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -1,25 +1,63 @@
+### Basic Settings
+
+# re-map prefix key
 set -g prefix C-x
 bind-key a send-prefix # for nested tmux sessions
-
+# re-source tmux.conf
+bind-key -T prefix r source-file ~/.tmux.conf
+# terminate tmux
 bind-key -T prefix C-q confirm-before -p "kill-window #W? (y/n)" kill-window
+# maximize current pane
 bind-key -T prefix f resize-pane -Z  # overwrites find window
-
+# resolved key forwarding problem 
+set-window-option -g xterm-keys on
 # had some struggle with vim key delay
 #set -s escape-time 0
-
-# use support - set to on if you want to use the mouse
+# mouse support
 setw -g mouse on
-
-# Set the default terminal mode to 256color mode
+# default TERM
 set -g default-terminal "screen-256color"
-
 # split settings
 bind-key -T prefix v split-window -h
 bind-key -T prefix h split-window 
-
 # Copy mode settings
 set-window-option -g mode-keys vi
 bind-key -t vi-copy 'v' begin-selection
 bind-key -t vi-copy 'y' copy-selection
 bind-key -T prefix C-v copy-mode 
 bind-key -T prefix p paste-buffer  # overwrites previous window
+
+
+### Colour Settings
+
+# bash cmd to display colours
+#for i in {0..255} ; do     printf "\x1b[38;5;${i}mcolour${i}\n"; done
+
+# default statusbar colors
+set-option -g status-bg colour235 
+set-option -g status-fg colour136 
+set-option -g status-attr default
+# default window title colors
+set-window-option -g window-status-fg colour244 
+set-window-option -g window-status-bg default
+#set-window-option -g window-status-attr dim
+# active window title colors
+set-window-option -g window-status-current-fg colour166 
+set-window-option -g window-status-current-bg default
+#set-window-option -g window-status-current-attr bright
+# pane border
+set-option -g pane-border-fg colour235 
+set-option -g pane-active-border-fg colour202
+# message text
+set-option -g message-bg colour235 
+set-option -g message-fg colour166 
+# pane number display
+set-option -g display-panes-active-colour colour33 
+set-option -g display-panes-colour colour166 
+# clock
+#set-window-option -g clock-mode-colour colour62 
+
+set -g status-right '#[fg=colour233,bg=colour241,bold] %d/%m #[fg=colour233,bg=colour245,bold] %H:%M '
+#set -g status-right '#[fg=colour233,bg=colour241,bold] %d/%m #[fg=colour233,bg=colour245,bold] %H:%M:%S '
+set -g status-right-length 50
+#set status-interval 5
diff --git a/.vim/colors/buddy.vim b/.vim/colors/buddy.vim
index dc55c97..42f1478 100755
--- a/.vim/colors/buddy.vim
+++ b/.vim/colors/buddy.vim
@@ -1,5 +1,5 @@
 " Vim color file - buddy_modified
-" Generated by http://bytefluent.com/vivify 2015-10-13
+
 set background=dark
 if version > 580
 	hi clear
diff --git a/.vim/install_vundle.sh b/.vim/install_vundle.sh
index b713214..f5caef2 100755
--- a/.vim/install_vundle.sh
+++ b/.vim/install_vundle.sh
@@ -11,3 +11,6 @@ fi
 if [ ! -d $INSTALL_DIR/Vundle.vim ]; then 
     git clone https://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle/Vundle.vim
 fi
+
+# install plugins
+vim +PluginInstall +qall 
diff --git a/.vim/vimrc_files/colors.vim b/.vim/vimrc_files/colors.vim
index 20b9b31..3a68794 100644
--- a/.vim/vimrc_files/colors.vim
+++ b/.vim/vimrc_files/colors.vim
@@ -1,5 +1,3 @@
 " dotfiles -- .vim/vimrc_files/colors.vim
 " author: johannst
 
-hi x226_Yellow1 ctermfg=226 guifg=#ffff00 "rgb=255,255,0
-"hi x81_Light_Blue ctermfg=81 guifg=#ff0000
diff --git a/.vim/vimrc_files/highlights.vim b/.vim/vimrc_files/highlights.vim
index 4a8c13d..61c349a 100644
--- a/.vim/vimrc_files/highlights.vim
+++ b/.vim/vimrc_files/highlights.vim
@@ -12,6 +12,10 @@ augroup CLNRSet
     autocmd! ColorScheme * hi CursorLineNR cterm=bold ctermfg=226
 augroup END
 
-
+" Highlight status line
 hi StatusLine ctermbg=38 ctermfg=0 cterm=NONE term=NONE gui=NONE
 "hi StatusLineNC ctermbg=81 ctermfg=0
+
+" matching brackets
+"hi MatchParen cterm=underline ctermbg=141 ctermfg=yellow
+hi MatchParen cterm=underline ctermbg=141 ctermfg=yellow
diff --git a/.vim/vimrc_files/keymaps.vim b/.vim/vimrc_files/keymaps.vim
index b38f5e9..f61663f 100644
--- a/.vim/vimrc_files/keymaps.vim
+++ b/.vim/vimrc_files/keymaps.vim
@@ -19,58 +19,22 @@ noremap <leader>q :q<CR>
 " re-adjust indentation
 map <leader>f mzgg=G`z
 
-"let ArrowDisableMessage = "Arrow Keys disabled! Better learn hjkl ;)"
-
-" Disable arrow keys -- train jklh
-" nnoremap <Left>  :echo ArrowDisableMessage<CR>
-" nnoremap <Right> :echo ArrowDisableMessage<CR>
-" nnoremap <Up>    :echo ArrowDisableMessage<CR>
-" nnoremap <Down>  :echo ArrowDisableMessage<CR>
-" 
-" vnoremap <Left>  :<c-u>echo ArrowDisableMessage<CR>
-" vnoremap <Right> :<c-u>echo ArrowDisableMessage<CR>
-" vnoremap <Up>    :<c-u>echo ArrowDisableMessage<CR>
-" vnoremap <Down>  :<c-u>echo ArrowDisableMessage<CR>
-" 
-" inoremap <Left>  <c-o>:echo ArrowDisableMessage<CR>
-" inoremap <Right> <c-o>:echo ArrowDisableMessage<CR>
-" inoremap <Up>    <c-o>:echo ArrowDisableMessage<CR>
-" inoremap <Down>  <c-o>:echo ArrowDisableMessage<CR>
-
-
-" ctrl-hjkl move in insert mode
-inoremap <c-h> <Left>
-inoremap <c-j> <Down>
-inoremap <c-k> <Up>
-inoremap <c-l> <Right>
-
-
-" ctrl-jk movement in command window
-cnoremap <c-h> <Left>
-cnoremap <c-j> <Down>
-cnoremap <c-k> <Up>
-cnoremap <c-l> <Right>
-
-
 " navigate between different splits 
 map <C-Down>  <c-w>j
 map <C-Up>    <c-w>k
 map <C-Right> <c-w>l
 map <C-Left>  <c-w>h
 
-
 " resize splits
 map <C-j>     <C-w>5-
 map <C-k>     <C-w>5+
 map <C-l>     <C-w>5<
 map <C-h>     <C-w>5>
 
-   
 " navigate between different buffers 
 nnoremap <S-Left>  :bprevious<CR>
 nnoremap <S-Right> :bnext<CR>
 
-
 " ctrl-ae jump to line start/end 
 nnoremap <C-a> 0
 nnoremap <C-e> $
@@ -81,7 +45,6 @@ vnoremap <C-e> $
 cnoremap <C-a> <Home>
 cnoremap <C-e> <End>
 
-
 " Shortcut to toggle relative numbering mode
 nnoremap <c-n> :call ToggleRelativeNumber()<CR>
 
@@ -92,7 +55,12 @@ imap <C-f> <ESC><C-f>
 vnoremap <C-f> VV'<O//{{{<Esc>'>o//}}}<Esc>'<<ESC><Up>A 
 
 " substitute selection
-vnoremap <C-r> "hy:%s/<C-r>h//gc<left><left><left>
+vnoremap <C-r> "hy:%s/<C-r>h/<C-r>h/gc<left><left><left>
+
+" yank/paste into/from register
+vnoremap <C-c> "ay
+inoremap <C-v> <C-r>a
+cnoremap <C-v> <C-r>a
 
 " +-----------------+
 " | Plugin specific |
diff --git a/.vim/vimrc_files/plugin_config.vim b/.vim/vimrc_files/plugin_config.vim
index d4c0848..c7b1a8f 100644
--- a/.vim/vimrc_files/plugin_config.vim
+++ b/.vim/vimrc_files/plugin_config.vim
@@ -1,7 +1,6 @@
 " dotfiles -- .vim/vimrc_files/plugin_config.vim
 " author: johannst
 
-
 " +----------------------------+
 " | Vim-Airline                |
 " +----------------------------+
@@ -10,20 +9,16 @@ let g:airline#extensions#tabline#enabled = 1
 " Show just the filename
 let g:airline#extensions#tabline#fnamemod = ':t'
 
-
 let g:airline_powerline_fonts = 1
 
 if !exists('g:airline_symbols')
      let g:airline_symbols = {}
 endif
 
-
 " +----------------------------+
 " | Tagbar                     |
 " +----------------------------+
-let g:tagbar_ctags_bin='/u/jstolp/apps/bin/ctags'
-"let g:tagbar_ctags_bin='/home/johannst/apps/bin/ctags'
-
+let g:tagbar_ctags_bin='~/.vim/bin/ctags'
 
 " +----------------------------+
 " | OmniCppComplete            |
@@ -32,14 +27,14 @@ let g:tagbar_ctags_bin='/u/jstolp/apps/bin/ctags'
 " set tags+=~/.vim/tags/cpp_tags
 
 " OmniCppComplete
-let OmniCpp_NamespaceSearch = 1
-let OmniCpp_GlobalScopeSearch = 1
-let OmniCpp_ShowAccess = 1
-let OmniCpp_ShowPrototypeInAbbr = 1 " show function parameters
-let OmniCpp_MayCompleteDot = 1 " autocomplete after .
-let OmniCpp_MayCompleteArrow = 1 " autocomplete after ->
-let OmniCpp_MayCompleteScope = 1 " autocomplete after ::
-let OmniCpp_DefaultNamespaces = ["std", "_GLIBCXX_STD"]
-" automatically open and close the popup menu / preview window
-au CursorMovedI,InsertLeave * if pumvisible() == 0|silent! pclose|endif
-set completeopt=menuone,menu,longest,preview
+"let OmniCpp_NamespaceSearch = 1
+"let OmniCpp_GlobalScopeSearch = 1
+"let OmniCpp_ShowAccess = 1
+"let OmniCpp_ShowPrototypeInAbbr = 1 " show function parameters
+"let OmniCpp_MayCompleteDot = 1 " autocomplete after .
+"let OmniCpp_MayCompleteArrow = 1 " autocomplete after ->
+"let OmniCpp_MayCompleteScope = 1 " autocomplete after ::
+"let OmniCpp_DefaultNamespaces = ["std", "_GLIBCXX_STD"]
+"" automatically open and close the popup menu / preview window
+"au CursorMovedI,InsertLeave * if pumvisible() == 0|silent! pclose|endif
+"set completeopt=menuone,menu,longest,preview
diff --git a/.vim/vimrc_files/vundle.vim b/.vim/vimrc_files/vundle.vim
index c35d77d..eb568ef 100644
--- a/.vim/vimrc_files/vundle.vim
+++ b/.vim/vimrc_files/vundle.vim
@@ -10,8 +10,8 @@ set rtp+=~/.vim/bundle/Vundle.vim
 call vundle#begin()
 
 Plugin 'VundleVim/Vundle.vim'
-Plugin 'jlanzarotta/bufexplorer'
 
+Plugin 'jlanzarotta/bufexplorer'
 
 Plugin 'vim-airline/vim-airline'
 Plugin 'vim-airline/vim-airline-themes'
@@ -19,9 +19,6 @@ Plugin 'vim-airline/vim-airline-themes'
 Plugin 'majutsushi/tagbar'
 
 " c++ modifief headers: http://www.vim.org/scripts/script.php?script_id=2358
-Plugin 'vim-scripts/OmniCppComplete'
-
-"Plugin 'vim-scripts/Conque-GDB'
-Plugin 'tpope/vim-dispatch'
+"Plugin 'vim-scripts/OmniCppComplete'
 
 call vundle#end()         
diff --git a/.vimrc b/.vimrc
index c1e6515..c999d04 100644
--- a/.vimrc
+++ b/.vimrc
@@ -3,30 +3,21 @@
 
 set nocompatible     " make Vim less Vi 
 
-
-
-
-
-
 source ~/.vim/vimrc_files/vundle.vim
 source ~/.vim/vimrc_files/plugin_config.vim
 
-
 " +----------------------------+
 " | Color Settings             |
 " +----------------------------+
 syntax on
-
-" default colorscheme
 set background=dark
 colorscheme buddy
 
-
 " +----------------------------+
 " | Basic Settings             |
 " +----------------------------+
-set timeoutlen=1234           " time in ms until keymap interpreted
-set ttimeoutlen=1             " time in ms for key code delay, NEVER USE 0 again!!!
+set timeoutlen=1000           " time in ms until keymap interpreted
+set ttimeoutlen=100           " time in ms for key code delay, NEVER USE 0 again!!!
 
 filetype plugin indent on     " enable loading indent file for filetype
 set ffs=unix,dos,mac          " Try recognizing dos, unix, and mac line endings.
@@ -37,19 +28,34 @@ set title                     " show title in console title bar
 set cursorline                " cursor line highlighting
 set cursorcolumn              " cursor column highlighting 
 set confirm                   " Y-N-C prompt if closing with unsaved changes.
+set ruler                     " display cursor position
+set laststatus=2              " always show status line
+set shortmess+=a              " Use [+]/[RO]/[w] for modified/readonly/written.
+set showcmd                   " Show (partial) command in status line.
 
-set mouse=a		              " Enable mouse usage (all modes)
+set mouse=a                   " Enable mouse usage (all modes)
 set encoding=utf-8            " Set default encoding to UTF-8.
 set history=1000              " Sets how many lines of history VIM has to remember
 set tabpagemax=100            " Sets how many tabs will be opened
-set scrolloff=2               " set vertical scroll distance to 7 lines
-set tabstop=4                 " set Tab-length
+set scrolloff=3               " set vertical scroll distance to 7 lines
+
+" Tab/Indentation settings
 set expandtab                 " expand tabs to spaces
-set shiftwidth=4              " but an indent level is 2 spaces wide.
-set softtabstop=4             " <BS> over an autoindent deletes both spaces.
+set tabstop=8                 " number of columns a tab counts
+set shiftwidth=3              " number of columns text is indented 
+set softtabstop=3             " number of columns tab counts in insert mode
 set shiftround                " rounds indent to a multiple of shiftwidth
+"set smarttab                  " Handle tabs more intelligently 
+set autoindent                " Copy indent from current line when starting a new line
+set smartindent               " use smart indent if there is no indent file
+
+"set list                     " show invisible character
+set listchars=tab:>-,eol:$,trail:-,precedes:<,extends:>
+
 set backspace=2
-autocmd BufNewFile,BufRead * setlocal formatoptions=ql   " disable auto-comment
+autocmd BufRead,BufNewFile *.h,*.hh,*.hpp,*.c,*.cc,*.cpp set cinoptions=:1,=2,g1,h2  " switch-case/class-lable indentation
+"autocmd BufRead,BufNewFile *.h,*.hh,*.hpp,*.c,*.cc,*.cpp setlocal formatoptions=ql   " disable auto-comment
+autocmd BufRead,BufNewFile * setlocal formatoptions-=cro   " disable auto-comment
 
 set foldmethod=marker         " set fold method
 
@@ -58,30 +64,21 @@ set nowrap                    " don't wrap text
 set noautowrite               " Never write a file unless I request it.
 set noautowriteall            " NEVER.
 set noautoread                " Don't automatically re-read changed files.
-set shortmess+=a              " Use [+]/[RO]/[w] for modified/readonly/written.
 
-set smarttab                  " Handle tabs more intelligently 
-set smartcase	              " Do smart case matching
-set autoindent                " Copy indent from current line when starting a new line
-set smartindent               " use smart indent if there is no indent file
-set showmatch	              " Show matching brackets.
-set mat=2                     " how many tenths of a second to blink when matching brackets
-set matchpairs+=<:>           " show matching <> as well
+" Search settings
+set ignorecase                " case insensitive matching
+set incsearch                 " incremental search
 set hlsearch                  " highlight search results
-set ignorecase	              " Do case insensitive matching
-set incsearch	              " Incremental search
+set smartcase                 " overwrite ignorecase if pattern contains capital letters
+set showmatch                 " show matching brackets.
+set matchtime=2               " how many tenths of a second to blink when matching brackets
+set matchpairs+=<:>           " show matching <> as well
 set magic                     " for regular expressions turn magic on
 
-
-set ruler        " display cursor position
-set laststatus=2 " always show status line
-set showcmd		 " Show (partial) command in status line.
-
-
+" Vim command completion settings
 set wildmenu                  " turn on the wild menu
-set wildmode=full             " <Tab> cycles between all matching choices.
-" Ignore these files when completing
-set wildignore+=*.o,*.obj,.git,*.pyc,*~
+set wildmode=longest:full     " <Tab> cycles between all matching choices.
+set wildignore+=*.o,*.obj,.git,*.pyc,*~ " Ignore these files when completing
 
 " No annoying sound on errors
 set noerrorbells
@@ -90,8 +87,6 @@ set novisualbell
 " automatically open Quickfix
 autocmd QuickFixCmdPost [^l]* nested cwindow
 autocmd QuickFixCmdPost    l* nested lwindow
-nnoremap <leader>m :silent make!\|redraw!\|cc<CR>
-nnoremap <leader>g :silent grep! -R \|redraw!\|cc
 
 " +----------------------------+
 " | Source Extrenal Files      |
@@ -100,3 +95,14 @@ source ~/.vim/vimrc_files/colors.vim
 source ~/.vim/vimrc_files/keymaps.vim
 source ~/.vim/vimrc_files/highlights.vim
 source ~/.vim/vimrc_files/functions.vim
+
+" +----------------------------+
+" | Tmux specific settings     |
+" +----------------------------+
+" tmux will send xterm-style keys when its xterm-keys option is on
+if &term =~ '^screen'
+    execute "set <xUp>=\e[1;*A"
+    execute "set <xDown>=\e[1;*B"
+    execute "set <xRight>=\e[1;*C"
+    execute "set <xLeft>=\e[1;*D"
+endif
diff --git a/README.md b/README.md
index 0fffbdd..6a22c80 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,5 @@
-# dotfiles
+# dotfiles -- README
+# author: johannst
 
 - **.vim/colors**:
 	- solarized: https://github.com/altercation/solarized