summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUrbain Vaes <urbain@vaes.uk>2015-05-20 23:08:01 +0100
committerUrbain Vaes <urbain@vaes.uk>2015-05-20 23:08:01 +0100
commit2f5628ebbc2abe38211baaf1472ce2cbdc7d38ea (patch)
tree96d2c4ca12f9b6d357838f5e4c87015a1017d98a
parentc8f25a2c99174e0a5210527a985b49c2706c6c0f (diff)
parentc10a9883122d6d3efeb24784a7c76ae004dc2d83 (diff)
Merge branch 'master' of github.com:uvaes/dotfiles
-rw-r--r--nvimrc10
1 files changed, 7 insertions, 3 deletions
diff --git a/nvimrc b/nvimrc
index 3c6f84c..3cf59e5 100644
--- a/nvimrc
+++ b/nvimrc
@@ -73,6 +73,7 @@ let g:ctrlp_open_new_file = 't'
let g:ctrlp_show_hidden = 1
let g:ctrlp_user_command = ['.git/', 'git --git-dir=%s/.git ls-files -oc --exclude-standard']
let g:ctrlp_working_path_mode = 'r'
+nnoremap <a-p> :CtrlPMRUFiles<cr>
let g:syntastic_cpp_compiler = "g++"
let g:syntastic_cpp_compiler_options = "-std=c++11 -Wall -Wextra -Wpedantic"
@@ -147,9 +148,13 @@ set encoding=utf-8
set mouse=a
set clipboard=unnamedplus
set lazyredraw
+set hidden
" Colorscheme
try | colorscheme solarized | catch | endtry
+highlight Comment cterm=italic
+set t_ZH=
+set t_ZR=
"" Maps
@@ -231,11 +236,10 @@ nnoremap <C-_> :b term<cr>i
inoremap <C-_> <Esc><C-^>i
"" Restore cursor position
-augroup cursorPosition
- au!
+augroup autocommands
+ autocmd BufWritePost *.cpp Neomake!
autocmd BufReadPost *
\ if line("'\"") > 1 && line("'\"") <= line("$") |
\ exe "normal! g`\"" |
\ endif
- autocmd! BufWritePost *.cpp Neomake!
augroup END