Updated lots of stuff

1 files changed, 4 insertions, 46 deletions

diff --git a/.vimrc b/.vimrc
index 85b07f0..cd35a78 100644
--- a/.vimrc
+++ b/.vimrc
@@ -13,6 +13,7 @@ Plugin 'VundleVim/Vundle.vim'
 
 Plugin 'tpope/vim-surround'
 Plugin 'tpope/vim-repeat'
+Plugin 'tpope/vim-fugitive'
 
 Plugin 'vim-latex/vim-latex'
 
@@ -29,6 +30,7 @@ else
 endif
 
 Plugin 'agude/vim-eldar'
+Plugin 'scrooloose/nerdtree'
 
 " Track the engine.
 Plugin 'SirVer/ultisnips'
@@ -52,52 +54,16 @@ set noexpandtab
 
 let g:deoplete#enable_at_startup = 1
 
-
-inoremap <expr> <Tab> pumvisible() ? "\<C-n>" : "\<Tab>"
-inoremap <expr> <S-Tab> pumvisible() ? "\<C-p>" : "\<S-Tab>"
-
-
 tnoremap <C-e> <C-\><C-n>
 
 " Map C-s
 noremap <silent> <C-S>     :update<CR>
 
-" Make ToBegin and ToEnd
-function! InputChar()
-    let c = getchar()
-    return type(c) == type(0) ? nr2char(c) : c
-endfunction
-
-function! ToEnd()
-    let s =  InputChar()
-    if s =~ "\<esc>" || s =~ "\<c-c>"  
-        return
-    endif
-    execute "normal! vi". s. "\<Esc>"
-endfunction
-
-function! ToBegin()
-    call ToEnd()
-    execute "'<"
-endfunction
-
-nnoremap <silent> ge :call ToEnd()<cr>
-nnoremap <silent> gb :call ToBegin()<cr>
-
 map <C-n> :NERDTreeToggle<CR>
 
 " Required for operations modifying multiple buffers like rename.
 set hidden
 
-let g:LanguageClient_serverCommands = {
-    \ 'rust': ['rustup', 'run', 'stable', 'rls'],
-    \ }
-
-"nnoremap <silent> K :call LanguageClient#textDocument_hover()<CR>
-"nnoremap <silent> gd :call LanguageClient#textDocument_definition()<CR>
-"nnoremap <silent> <F2> :call LanguageClient#textDocument_rename()<CR>
-"nnoremap <F5> :call LanguageClient_contextMenu()<CR>
-
 
 " Trigger configuration. Do not use <tab> if you use https://github.com/Valloric/YouCompleteMe.
 let g:UltiSnipsExpandTrigger="<c-b>"
@@ -107,16 +73,9 @@ let g:UltiSnipsJumpBackwardTrigger="<c-z>"
 " If you want :UltiSnipsEdit to split your window.
 let g:UltiSnipsEditSplit="vertical"
 
-
 inoremap <expr> <Tab> pumvisible() ? "\<C-n>" : "\<Tab>"
 inoremap <expr> <S-Tab> pumvisible() ? "\<C-p>" : "\<S-Tab>"
 
-
-" Run  binding
-nnoremap <F5> :!terminator -e '"%:p" ;read -n 1'<CR>
-set completeopt-=preview
-
-
 " File finding
 set path+=**
 set wildmenu
@@ -124,6 +83,5 @@ set wildmenu
 let g:netrw_liststyle=3
 
 
-" Snippits
-
-nnoremap ,html :-1read $HOME/.vim/snippets/skeleton.html<CR>
+set inccommand=split
+autocmd FileType python setlocal completeopt-=preview