Major vimrc changes

vim/vimrc

@@ -2,9 +2,9 @@
 if has('conceal')
   set conceallevel=2 concealcursor=i
 endif
-nnoremap <Leader>autoformat! :%s/, /,<CR>:%s/ \/ /\/<CR>:%s/ {/{<CR>:%s/} /}<CR>:%s/ = /=
 let g:formatdef_my_custom_java = '"astyle --mode=java -xc --style=google -j -s3 -xG -S -K -N -xn -xl -n -p -H"'
 let g:formatters_java = ['my_custom_java']
+let g:UltiSnipsUsePythonVersion=3
 command! WW %!sudo tee > /dev/null %
 "TODO: Fix this
 "let g:rbpt_loadcmd_toggle = 1
@@ -17,120 +17,129 @@ set grepprg=grep\ -nH\ $*
 let g:tex_flavor='latex'
 
 "match Error /\s\+$/
-"nnoremap s xa
+" Basic, very important mappings {
-"nnoremap <F5> :UndotreeToggle<CR>
+  " Movement {
-"inoremap <expr><Tab> pumvisible() ? "\<C-n>" : "\<Tab>"
+    "Vertical
-nnoremap <Leader><Space> :CtrlPTag<CR>
+    nnoremap gj j
-nnoremap <C-w>\| <C-w>v<C-w>l
+    nnoremap gk k
-nnoremap <C-w>- <C-w>s<C-w>j
+    nnoremap j gj
-nnoremap <C-d> <C-w>q
+    nnoremap k gk
+    vnoremap gj j
+    vnoremap gk k
+    vnoremap j gj
+    vnoremap k gk
+    "Horizontal
+    nnoremap Y y$
+    nnoremap H ^
+    nnoremap L $
+    vnoremap L $h
+    vnoremap H ^
+    "Move to end of line
+    inoremap jk <Esc>A
+    inoremap kj <Esc>A
+    "Move to last character of last line
     nnoremap G G$
     vnoremap G G$
-nnoremap <F5> :GundoToggle<CR>
+  " }
+  " Buffers {
+    "Control-key movement
+    nnoremap <C-h> <C-w>h
+    nnoremap <C-j> <C-w>j
+    nnoremap <C-k> <C-w>k
+    nnoremap <C-l> <C-w>l
+    "Arrow keys
+    nnoremap <Up> <C-w>w
+    nnoremap <Down> <C-w>W
+    nnoremap <Left> :bp<CR>
+    nnoremap <Right> :bn<CR>
+    "Vertical and horizontal split
+    nnoremap <C-w>\| <C-w>v<C-w>l
+    nnoremap <C-w>- <C-w>s<C-w>j
+    "Close buffer
+    nnoremap <C-d> <C-w>q
+    "Fullscreen buffer
+    nnoremap <C-w>z <C-w>_<C-w>\|
+    "Go to last buffer
+    nnoremap <Leader><Leader> <C-^>
+  " }
+  " Misc {
+    vnoremap <silent> * :call VisualSelection('f')<CR>
+    vnoremap <silent> # :call VisualSelection('b')<CR>
+    vnoremap ; :
+    nnoremap ! :!
+    vnoremap < <gv
+    vnoremap > >gv
+    "Disable F1
+    nnoremap <F1> <nop>
+    inoremap <F1> <nop>
+    vnoremap <F1> <nop>
+    "F2 toggle paste
+    nnoremap <F2> :set invpaste<CR>
+    "Better searching
+    nnoremap / /\v
+    vnoremap / /\v
+    "Addition and subtraction
     nnoremap + <C-a>
     nnoremap - <C-x>
+    "Backspace remove highlights
+    nnoremap <BS> :nohlsearch<CR>g<C-g>zo
+    "Better save
+    nnoremap <Enter> :up<CR>:silent! call sy#start()<CR>
+    "Unmap Q
     nnoremap Q <Nop>
-nnoremap <Leader><Leader> <C-^>
+  " }
-nnoremap <Leader>a :!git st<CR>:!ls<CR>:!git a
+" }
-nnoremap <Leader>up :!git pull origin
+" Plugin mappings {
-nnoremap <Leader>st :!git st<CR>
+  "Easymotion
-nnoremap <Leader>ci :!git st<CR>:!git ci ""<Left>
+  map , <Plug>(easymotion-prefix)
-nnoremap <Leader>log :!git hist<CR>
+  "Ctrl-p
-nnoremap <Leader>br :!git br<CR>
+  nnoremap <Leader><C-p> :CtrlPFunky<CR>
-nnoremap gb :ls<CR>:b
+  "Gundo
-nnoremap <Leader>d :bd
+  nnoremap <F5> :GundoToggle<CR>
-nnoremap <Leader>q :q
+  "Easytags
-nnoremap <Leader>W :%s/\s\+$//<CR>:let @/=''<CR>
+  "nnoremap <Leader><Space> :CtrlPTag<CR>
-nnoremap <Leader>o m`o<Esc>``
+  "Tagbar
-nnoremap <Leader>O m`O<Esc>``
+  nnoremap <Leader><Space> :Tagbar<CR>
-nnoremap <Leader>go %m`%x``
+  "Add a bundle from clipboard
+  nnoremap <Leader>bun G?Plug <CR>yyjp$hdi'"+gPo  " \| <Esc>"+gp<Esc>:nohlsearch<CR>:up<CR>:PlugInstall
+  "Automatic if/else/for/while wrappers
   nnoremap <Leader>if m"Oif(){<Esc>jo}<Esc>`"v><Esc>k^wa
   nnoremap <Leader>else m"kAelse{<Esc>jo}<Esc>`"v><Esc>
   nnoremap <Leader>for m"Ofor(){<Esc>jo}<Esc>`"v><Esc>k^wa
   nnoremap <Leader>while m"Owhile(){<Esc>jo}<Esc>`"v><Esc>k^wa
   nnoremap <Leader>rm m"kddjddkv<<Esc>`"
-nnoremap <Leader># O#{{{<Esc>jo#}}}<Esc>kk^a
-vnoremap <Leader># <Esc>`<O#{{{<Esc>`>o#}}}<Esc>`<k^a
-nnoremap <Leader>{ O//{{{<Esc>jo//}}}<Esc>kk^la
-vnoremap <Leader>{ <Esc>`<O//{{{<Esc>`>o//}}}<Esc>`<k^la
   vnoremap <Leader>if <Esc>`<Oif(){<Esc>`>o}<Esc>gv><Esc>`<k^wa
   vnoremap <Leader>else <Esc>`<kAelse{<Esc>`>o}<Esc>gv><Esc>
   vnoremap <Leader>for <Esc>`<Ofor(){<Esc>`>o}<Esc>gv><Esc>`<k^wa
   vnoremap <Leader>while <Esc>`<Owhile(){<Esc>`>o}<Esc>gv><Esc>`<k^wa
   vnoremap <Leader>rm <Esc>`<<Esc>kdd`>jddgv<<Esc>
-vnoremap <silent> * :call VisualSelection('f')<CR>
+" }
-vnoremap <silent> # :call VisualSelection('b')<CR>
+" Trial mappings {
-"nnoremap <Space> zo:set hlsearch! hlsearch?<CR>
+  nnoremap <Leader>o m`o<Esc>``
-"nnoremap <Space> :nohlsearch<CR>g<C-g>zo
+  nnoremap <Leader>O m`O<Esc>``
-nnoremap <BS> :nohlsearch<CR>g<C-g>zo
+" }
-nnoremap U <C-r>
+
-nnoremap K i<CR><Esc>k$
+
-nnoremap <Enter> :up<CR>:silent! call sy#start()<CR>
+" Gui options {
-vnoremap gj j
-vnoremap gk k
-vnoremap j gj
-vnoremap k gk
-vnoremap H ^
-vnoremap L $h
-vnoremap ; :
-nnoremap gj j
-nnoremap gk k
-nnoremap j gj
-nnoremap k gk
-nnoremap H ^
-nnoremap L $
-nnoremap <C-h> <C-w>h
-nnoremap <C-j> <C-w>j
-nnoremap <C-k> <C-w>k
-nnoremap <C-l> <C-w>l
-map , <Plug>(easymotion-prefix)
-nnoremap ! :!
-"nnoremap ; m"A;<Esc>`"
-vnoremap < <gv
-vnoremap > >gv
-nnoremap <F1> <nop>
-inoremap <F1> <nop>
-vnoremap <F1> <nop>
-nnoremap <Leader>** yyPv$r*jyypv$r*
-nnoremap <Leader>= yypv$r=
-nnoremap <Leader>- yypv$r-
-nnoremap <Leader>^ yypv$r^
-nnoremap <Leader>" yypv$r"
-"inoremap ;; <Esc>m`A;<Esc>``a
-"inoremap ;;<Space> <Esc>A;<Esc>o
-"nnoremap ;; m"A;<Esc>`"
-"nnoremap ;;<Space> A;<Esc>o
-nnoremap Y y$
-nnoremap <Up> <C-w>w
-nnoremap <Down> <C-w>W
-nnoremap <Left> :bp<CR>
-nnoremap <Right> :bn<CR>
-nnoremap <C-w>z <C-w>_<C-w>\|
-"nnoremap <Leader>bun G?Plug <CR>yyjp$hdi'"+gP0Wl3d/\/<CR>xjyyP$"+gp<Esc>:nohlsearch<CR>:up<CR>:PluginInstall
-nnoremap <Leader>bun G?Plug <CR>yyjp$hdi'"+gPo  " \| <Esc>"+gp<Esc>:nohlsearch<CR>:up<CR>:PlugInstall
-nnoremap <Leader><C-p> :CtrlPFunky<CR>
-nnoremap <F2> :set invpaste<CR>
-"nnoremap <C-Up> [e
-"nnoremap <C-Down> ]e
-"vnoremap <C-Up> [egv
-"vnoremap <C-Down> ]egv
-nnoremap / /\v
-vnoremap / /\v
-inoremap jk <Esc>A
-inoremap kj <Esc>A
-set tags=./tags;/
-set wildmode=longest,list,full
   set gfn=Monospace\ 8
   set guioptions=
   set guicursor+=n-v-c:blinkon0
+  set mouse-=a
+" }
+" Annoyance fixes {
+  "Annoying escape timeouts
   set ttimeout
   set ttimeoutlen=0
   set notimeout
+" }
+" Misc {
+  set tabstop=2 shiftwidth=2 expandtab
+  set tags=./tags;/
+  set wildmode=longest,list,full
   set formatoptions-=r
   set formatoptions-=o
   set diffopt+=iwhite
   set noesckeys
-set mouse-=a
   set shiftwidth=2
   set tabstop=2
   set modeline
@@ -159,16 +168,15 @@ set foldnestmax=10
   set foldlevel=2
   set relativenumber
   set number
-set ts=2 sw=2 et
   set background=dark
   set t_Co=256
   set gdefault
   set nocompatible
-"set rtp+=~/.vim/bundle/vundle/
   set ignorecase
   set textwidth=0
   syntax on
-"let g:AutoPairs = {'(':')', '[':']', '{':'}',"'":"'",'"':'"', '`':'`', '<':'>', '%':'%'}
+" }
+
 let g:signify_vcs_list = [ 'git', 'svn' ]
 let g:signify_difftool = 'diff'
 let g:ctrlp_root_markers = ['.cproot']
@@ -195,22 +203,11 @@ let g:Powerline_symbols='fancy'
 let g:indent_guides_start_level=1
 let g:indent_guides_guide_size=1
 let g:indent_guides_enable_on_vim_startup=1
-"let g:neocomplcache_enable_at_startup=1
-"let g:neocomplcache_enable_camel_case_completion=1
-"let g:neocomplcache_enable_smart_case=1
-"let g:neocomplcache_enable_underbar_completion=1
-"let g:neocomplcache_enable_auto_delimiter=1
-"let g:neocomplcache_max_list=20
-"let g:neocomplcache_force_overwrite_completefunc=1
-"let g:neocomplcache_min_syntax_length=2
-"let g:neocomplcache_enable_auto_select=1
-let g:neocomplete#enable_at_startup = 1
-let g:neocomplete#enable_smart_case = 1
-let g:neocomplete#sources#syntax#min_keyword_length = 2
 let g:php_refactor_command='php /usr/local/bin/refactor.phar'
 let g:ctrlp_extensions=['funky']
 function! g:UltiSnips_Complete()
   call UltiSnips#ExpandSnippet()
+  echo "Test"
   if g:ulti_expand_res == 0
     if pumvisible()
       return "\<C-n>"
@@ -223,10 +220,13 @@ function! g:UltiSnips_Complete()
   endif
   return ""
 endfunction
-au BufEnter * exec "inoremap <silent> " . g:UltiSnipsExpandTrigger . " <C-R>=g:UltiSnips_Complete()<cr>"
+"inoremap <expr><Tab> pumvisible() ? "\<C-n>" : "\<Tab>"
-let g:UltiSnipsJumpForwardTrigger="<tab>"
+"inoremap <Tab> pumvisible() ? "\<C-n>" : "\<Tab>"
-let g:UltiSnipsListSnippets="<c-e>"
+let g:UltiSnipsJumpForwardTrigger="<Tab>"
+let g:UltiSnipsExpandTrigger="<S-Tab>"
+let g:UltiSnipsListSnippets="<C-e>"
 let g:UltiSnipsEditSplit="vertical"
+let g:ycm_key_list_select_completion = []
 inoremap <expr> <CR> pumvisible() ? "\<C-y>" : "\<C-g>u\<CR>"
 let loaded_matchit=1
 filetype off
@@ -235,39 +235,18 @@ if has("win32")
 else
   call plug#begin('~/.vim/plugged')
 endif
-"Plug 'tsaleh/vim-matchit'
+" Code writing {
-"Plug 'vim-scripts/YankRing.vim'
   Plug 'Chiel92/vim-autoformat'
     "Adds autoformat command | https://github.com/Chiel92/vim-autoformat
   Plug 'tpope/vim-surround'
     "Surround selection in ({\"' or HTML tags  | https://github.com/tpope/vim-surround
   Plug 'scrooloose/syntastic'
     "Syntax checker | https://github.com/scrooloose/syntastic
-Plug 'nathanaelkane/vim-indent-guides'
-  "Indentation guides | https://github.com/nathanaelkane/vim-indent-guides
-Plug 'elzr/vim-json'
-  "JSON highlighting | https://github.com/elzr/vim-json
-Plug 'groenewege/vim-less'
-  "LESS highlighting | https://github.com/groenewege/vim-less
-Plug 'pangloss/vim-javascript'
-  "JS syntax and indentation | https://github.com/pangloss/vim-javascript
-"Plug 'Lokaltog/powerline-fonts'
-"  "Better powerline fonts | https://github.com/Lokaltog/powerline-fonts
-Plug 'bling/vim-airline'
-  "Bottom status bar | https://github.com/bling/vim-airline
-Plug 'terryma/vim-multiple-cursors'
-  "Multicursor functionality like Coda | https://github.com/terryma/vim-multiple-cursors
   Plug 'scrooloose/nerdtree', { 'on':  'NERDTreeToggle' }
     "File browser | https://github.com/scrooloose/nerdtree
-"Plug 'altercation/vim-colors-solarized'
-"  "Theme | https://github.com/altercation/vim-colors-solarized
-Plug 'stonewareslord/vim-colors'
-  "Theme pack | https://github.com/spf13/vim-colors
-"Plug 'vim-scripts/AutoTag'
-"  "Generates taglist with ctags | https://github.com/vim-scripts/AutoTag
   Plug 'Lokaltog/vim-easymotion'
     "Move around quickly in a document | https://github.com/Lokaltog/vim-easymotion
-Plug 'sjl/gundo.vim'
+  Plug 'sjl/gundo.vim', { 'on': 'GundoToggle' }
     "Visual undo | https://github.com/sjl/gundo.vim
   Plug 'tommcdo/vim-exchange'
     "Exchange two selections of text | https://github.com/tommcdo/vim-exchange
@@ -279,45 +258,22 @@ Plug 'kien/ctrlp.vim'
     "Fuzzy file search | https://github.com/kien/ctrlp.vim
   Plug 'godlygeek/tabular'
     "Quickly make tables in vim | https://github.com/godlygeek/tabular
-Plug 'godlygeek/csapprox'
-  "256 color vim in terminal | https://github.com/godlygeek/csapprox
   Plug 'sirver/UltiSnips'
   "  "Adds snippets | https://github.com/sirver/UltiSnips
   Plug 'honza/vim-snippets'
     "More snippets | https://github.com/honza/vim-snippets
   Plug 'othree/eregex.vim'
     "Real regexes in vim | https://github.com/othree/eregex.vim
-Plug 'mattn/flappyvird-vim'
-  "The amazing Flappy Bird game | https://github.com/mattn/flappyvird-vim
-Plug 'superbrothers/vim-vimperator'
-  "Vimperator for vim | https://github.com/superbrothers/vim-vimperator
   Plug 'Rykka/colorv.vim'
     "Color selection in vim | https://github.com/Rykka/colorv.vim
-Plug 'mhinz/vim-signify'
-  "Git information inline | https://github.com/mhinz/vim-signify
-Plug 'jamessan/vim-gnupg'
-  "GPG support | https://github.com/jamessan/vim-gnupg
-Plug 'stonewareslord/zeavim.vim'
-  "Zeal support | https://github.com/stonewareslord/zeavim.vim
-Plug 'vim-scripts/DirDiff.vim'
-  "Directory diff | https://github.com/vim-scripts/DirDiff.vim
   Plug 'vim-scripts/DoxygenToolkit.vim'
     "Doxygen | https://github.com/vim-scripts/DoxygenToolkit.vim
-Plug 'vim-scripts/SyntaxRange'
+  Plug 'mhinz/vim-signify'
-  "Range of syntaxes | https://github.com/vim-scripts/SyntaxRange
+    "Git information inline | https://github.com/mhinz/vim-signify
-Plug 'PotatoesMaster/i3-vim-syntax'
-  "i3 syntax | https://github.com/PotatoesMaster/i3-vim-syntax
-Plug 'https://github.com/fatih/vim-go'
-  "go syntax | https://github.com/fatih/vim-go
-"Plug 'https://github.com/kien/rainbow_parentheses.vim'
-"  "Colored parenthesis | https://github.com/kien/rainbow_parentheses.vim
-"  " Removed because they did not function when changing buffers
   Plug 'https://github.com/jiangmiao/auto-pairs'
     "Automatic pairs | https://github.com/jiangmiao/auto-pairs
   Plug 'https://github.com/Valloric/YouCompleteMe'
   "  "Autocompletion | https://github.com/Valloric/YouCompleteMe
-Plug 'https://github.com/evidens/vim-twig'
-  "Twig highlighting | https://github.com/evidens/vim-twig
   Plug 'https://github.com/joonty/vdebug'
     "Php debugging | https://github.com/joonty/vdebug
   Plug 'https://github.com/zenbro/mirror.vim'
@@ -326,10 +282,51 @@ Plug 'https://github.com/xolox/vim-easytags'
     "Vim tags | https://github.com/xolox/vim-easytags
   Plug 'https://github.com/xolox/vim-misc'
     "Misc (required for easytags) | https://github.com/xolox/vim-misc
-Plug 'https://github.com/habamax/vim-skipit'
-  " | https://github.com/habamax/vim-skipit
   Plug 'gaw:stonewareslord/vim-java-getset.git'
-  " | gogs@austenwares.com:stonewareslord/vim-java-getset.git
+    "Java getters and setters| gogs@austenwares.com:stonewareslord/vim-java-getset.git
+  Plug 'https://github.com/majutsushi/tagbar'
+    " | https://github.com/majutsushi/tagbar
+  " }
+" Style {
+  Plug 'nathanaelkane/vim-indent-guides'
+    "Indentation guides | https://github.com/nathanaelkane/vim-indent-guides
+  Plug 'bling/vim-airline'
+    "Bottom status bar | https://github.com/bling/vim-airline
+  Plug 'stonewareslord/vim-colors'
+    "Theme pack | https://github.com/spf13/vim-colors
+  Plug 'godlygeek/csapprox'
+    "256 color vim in terminal | https://github.com/godlygeek/csapprox
+  " }
+" Syntax {
+  Plug 'elzr/vim-json'
+    "JSON highlighting | https://github.com/elzr/vim-json
+  Plug 'groenewege/vim-less'
+    "LESS highlighting | https://github.com/groenewege/vim-less
+  Plug 'pangloss/vim-javascript'
+    "JS syntax and indentation | https://github.com/pangloss/vim-javascript
+  Plug 'superbrothers/vim-vimperator'
+    "Vimperator for vim | https://github.com/superbrothers/vim-vimperator
+  Plug 'PotatoesMaster/i3-vim-syntax'
+    "i3 syntax | https://github.com/PotatoesMaster/i3-vim-syntax
+  Plug 'https://github.com/fatih/vim-go'
+    "go syntax | https://github.com/fatih/vim-go
+  Plug 'https://github.com/evidens/vim-twig'
+    "Twig highlighting | https://github.com/evidens/vim-twig
+  " }
+" Misc {
+  Plug 'mattn/flappyvird-vim'
+    "The amazing Flappy Bird game | https://github.com/mattn/flappyvird-vim
+  Plug 'jamessan/vim-gnupg'
+    "GPG support | https://github.com/jamessan/vim-gnupg
+" }
+" Unused {
+  "Plug 'vim-scripts/DirDiff.vim'
+    "Directory diff | https://github.com/vim-scripts/DirDiff.vim
+  "Plug 'https://github.com/kien/rainbow_parentheses.vim'
+  "  "Colored parenthesis | https://github.com/kien/rainbow_parentheses.vim
+  "Plug 'vim-scripts/SyntaxRange'
+    "Range of syntaxes | https://github.com/vim-scripts/SyntaxRange
+" }
 call plug#end()
 filetype plugin indent on
 if exists("+undofile")
@@ -362,7 +359,6 @@ else
   "colorscheme torte
 endif
 silent! colorscheme fruity
-nnoremap <Leader>W :%s/\s\+$//<cr>:let @/=''<cr>
 function! Initialize()
   if has("win32")
     if empty(glob("~/_vim/autoload/plug.vim"))
@@ -401,3 +397,4 @@ endfunction
         \ 're!\\[A-Za-z]*(ref|cite)[A-Za-z]*([^]]*])?{([^}]*, ?)*'
         \ ]
 set guifont=Fixed\ Medium\ Semi-Condensed\ 10
+inoremap <Tab> <C-R>=g:UltiSnips_Complete()<cr>