Merge branch 'master' of bitbucket.org:vishap/scripts

bin/socks5_on_1080.sh

@@ -1,2 +0,0 @@
-#!/bin/sh
-ssh -f -N -D 192.168.0.3:1080 yerevak.vostan.org

config/.gitconfig

@@ -23,3 +23,5 @@
 	path = ~/.gitconfig.local
 [core]
 	excludesfile = ~/.gitignore.global
+[credentail]
+	helper = cache

vim/vimrc

@@ -427,6 +427,7 @@ if filereadable(expand('~/.vim/bundle/Vundle.vim/README.md'))
     let g:airline#extensions#tabline#left_sep = ' '
     let g:airline#extensions#tabline#left_alt_sep = '|'
     let g:airline_powerline_fonts = 1
+
     "
     "
     "
@@ -461,7 +462,6 @@ if filereadable(expand('~/.vim/bundle/Vundle.vim/README.md'))
     let g:buffergator_viewport_split_policy = "L"
     map ab :BuffergatorToggle<CR>
     "map at :BuffergatorTabsToggle<CR>
-
     "
     " :A switches to the header file (or vise versa)
     " :AS splits and switches
@@ -483,6 +483,11 @@ if filereadable(expand('~/.vim/bundle/Vundle.vim/README.md'))
     let g:alternateExtensions_cpp = "h"
     let g:alternateExtensions_c = "h"
     map ah :A<CR>
+
+    "
+    "   Tmux integration.
+    "
+    Plugin 'benmills/vimux'
     "
     "   Extends modeline to variables.
     "   Needed by CF5 compile to read options right from file.
@@ -495,7 +500,7 @@ if filereadable(expand('~/.vim/bundle/Vundle.vim/README.md'))
     Plugin 'vishap/cf5-compile'
     map <silent> ac :call CF5CompileOnly()<CR>
     map <silent> ar :call CF5CompileAndRun()<CR>
-    
+
     "
     "   Provide templates
     "
@@ -534,7 +539,7 @@ if filereadable(expand('~/.vim/bundle/Vundle.vim/README.md'))
     "   :GitGutterLineHighlightsToggle
     "
     Plugin 'airblade/vim-gitgutter'
-    let g:gitgutter_sign_column_always = 1
+    set signcolumn=yes
     let g:gitgutter_map_keys = 0
     let g:gitgutter_realtime = 0
     let g:gitgutter_eager = 0
@@ -552,19 +557,26 @@ if filereadable(expand('~/.vim/bundle/Vundle.vim/README.md'))
 
     "
     "   Nice colorschemes.
+    "   Actual colorscheme is set outside as vundle resets it.
     "
-    if has("gui_running")
+    if &t_Co >= 256 || has('gui_running')
         Plugin 'nanotech/jellybeans.vim'
+        let g:jellybeans_use_lowcolor_black = 0
         "colorscheme jellybeans
-        "let g:jellybeans_use_lowcolor_black = 0
     endif
-    if has("gui_running")
+    if &t_Co >= 256 || has('gui_running')
         Plugin 'altercation/vim-colors-solarized.git'
         let g:solarized_termcolors=256
         "set backgroung=dark
         "set backgroung=light
         "colorscheme solarized
     endif
+    if &t_Co >= 256 || has('gui_running')
+        Plugin 'morhetz/gruvbox.git'
+        "set backgroung=dark
+        "set backgroung=light
+        "colorscheme solarized
+    endif
 
     "
     " :set syntax=cpp.doxygen to highlight doxygen comments.
@@ -598,6 +610,15 @@ if filereadable(expand('~/.vim/bundle/Vundle.vim/README.md'))
     filetype plugin on
 endif
 
+"
+"   Vundle resets this if set inside vundle section.
+"
+if &t_Co >= 256 || has('gui_running')
+    colorscheme jellybeans
+    hi clear SpellBad
+    hi SpellBad cterm=underline, ctermfg=red
+endif
+
 if exists("dddd")
 
 "Plugin 'Rip-Rip/clang_complete'