Merge https://github.com/jbjjbjjbj/newDotFiles

1 files changed, 54 insertions, 50 deletions

diff --git a/.vimrc b/.vimrc
index cd35a78..ee76460 100644
--- a/.vimrc
+++ b/.vimrc
@@ -2,44 +2,38 @@
 set nocompatible              " be iMproved, required
 filetype plugin on
 
-" set the runtime path to include Vundle and initialize
-set rtp+=~/.vim/bundle/Vundle.vim
-call vundle#begin()
-" alternatively, pass a path where Vundle should install plugins
-"call vundle#begin('~/some/path/here')
+" Plugins
+	" set the runtime path to include Vundle and initialize
+	set rtp+=~/.vim/bundle/Vundle.vim
+	call vundle#begin()
+	" alternatively, pass a path where Vundle should install plugins
+	"call vundle#begin('~/some/path/here')
 
-" let Vundle manage Vundle, required
-Plugin 'VundleVim/Vundle.vim'
+	" let Vundle manage Vundle, required
+	Plugin 'VundleVim/Vundle.vim'
 
-Plugin 'tpope/vim-surround'
-Plugin 'tpope/vim-repeat'
-Plugin 'tpope/vim-fugitive'
+	Plugin 'ervandew/supertab'
 
-Plugin 'vim-latex/vim-latex'
+	Plugin 'tpope/vim-surround'
+	Plugin 'tpope/vim-repeat'
 
-Plugin 'racer-rust/vim-racer'
+	Plugin 'racer-rust/vim-racer'
+	Plugin 'davidhalter/jedi-vim'
 
-Plugin 'zchee/deoplete-jedi'
+	Plugin 'agude/vim-eldar'
+	Plugin 'scrooloose/nerdtree'
 
-if has("nvim")
-	Plugin 'Shougo/deoplete.nvim'
-else
-	Plugin 'Shougo/deoplete.nvim'
-	Plugin 'roxma/nvim-yarp'
-	Plugin 'roxma/vim-hug-neovim-rpc'
-endif
+	" Track the engine.
+	Plugin 'SirVer/ultisnips'
 
-Plugin 'agude/vim-eldar'
-Plugin 'scrooloose/nerdtree'
+	" Snippets are separated from the engine. Add this if you want them:
+	Plugin 'honza/vim-snippets'
 
-" Track the engine.
-Plugin 'SirVer/ultisnips'
+	Plugin 'junegunn/goyo.vim'
+	Plugin 'jreybert/vimagit'
 
-" Snippets are separated from the engine. Add this if you want them:
-Plugin 'honza/vim-snippets'
-
-call vundle#end()            " required
-filetype plugin indent on    " required
+	call vundle#end()            " required
+	filetype plugin indent on    " required
 
 
 colorscheme eldar
@@ -52,36 +46,46 @@ set shiftwidth=4
 set softtabstop=4
 set noexpandtab
 
-let g:deoplete#enable_at_startup = 1
+set inccommand=split
 
-tnoremap <C-e> <C-\><C-n>
+" Required for operations modifying multiple buffers like rename.
+set hidden
 
-" Map C-s
-noremap <silent> <C-S>     :update<CR>
+" Snippits
+	" Trigger configuration. Do not use <tab> if you use https://github.com/Valloric/YouCompleteMe.
+	let g:UltiSnipsExpandTrigger="<c-b>"
+	let g:UltiSnipsJumpForwardTrigger="<c-b>"
+	let g:UltiSnipsJumpBackwardTrigger="<c-z>"
 
-map <C-n> :NERDTreeToggle<CR>
+	" If you want :UltiSnipsEdit to split your window.
+	let g:UltiSnipsEditSplit="vertical"
 
-" Required for operations modifying multiple buffers like rename.
-set hidden
+	" inoremap <expr> <Tab> pumvisible() ? "\<C-n>" : "\<Tab>"
+	" inoremap <expr> <S-Tab> pumvisible() ? "\<C-p>" : "\<S-Tab>"
 
+" File finding
+	set path+=**
+	set wildmenu
 
-" Trigger configuration. Do not use <tab> if you use https://github.com/Valloric/YouCompleteMe.
-let g:UltiSnipsExpandTrigger="<c-b>"
-let g:UltiSnipsJumpForwardTrigger="<c-b>"
-let g:UltiSnipsJumpBackwardTrigger="<c-z>"
+	let g:netrw_liststyle=3
 
-" If you want :UltiSnipsEdit to split your window.
-let g:UltiSnipsEditSplit="vertical"
+" autocmd BufEnter * call ncm2#enable_for_buffer()
+" let g:ncm2#auto_popup = 0
+set completeopt=menuone,preview
 
-inoremap <expr> <Tab> pumvisible() ? "\<C-n>" : "\<Tab>"
-inoremap <expr> <S-Tab> pumvisible() ? "\<C-p>" : "\<S-Tab>"
+" Keymapping
+	map <C-n> :NERDTreeToggle<CR>
 
-" File finding
-set path+=**
-set wildmenu
+	" Leader stuff
+		let mapleader=" "
 
-let g:netrw_liststyle=3
+		map <leader>z :Goyo<CR>
+		map <leader>mm :make V=1<CR>
+		map <leader>mf :make flash V=1<CR>
 
+		" Example on filetype specific
+		" autocmd FileType tex map <leader>o :w !detex \| wc -w<CR>
 
-set inccommand=split
-autocmd FileType python setlocal completeopt-=preview
+" Enforcing filetypes
+	autocmd BufRead,BufNewFile *.ino set filetype=c
+	autocmd FileType python setlocal completeopt-=preview