diff options
| -rw-r--r-- | gitconfig | 3 | ||||
| -rw-r--r-- | vimrc | 28 |
2 files changed, 25 insertions, 6 deletions
@@ -7,3 +7,6 @@ [core] excludesfile = ~/.gitignore autocrlf = input + pager = less -S +[merge] + tool = vimdiff @@ -1,4 +1,5 @@ -" vim: foldmethod=marker foldlevel=0 ts=2 sw=2 expandtab +" vimrc of Johannes Ranke +" Last Change: Tue Nov 15, 2016 at 08:11 AM +0100 " default settings (much is handled by tpope/sensible) {{{1 set ts=2 set sw=2 @@ -6,6 +7,8 @@ set expandtab set modeline filetype plugin on filetype indent on +set splitbelow +set splitright " to ease the use of plugin mappings let maplocalleader = "," @@ -24,6 +27,7 @@ Plug 'vim-pandoc/vim-pandoc-syntax' Plug 'vim-airline/vim-airline' Plug 'vim-airline/vim-airline-themes' Plug 'airblade/vim-gitgutter' +Plug 'jranke/lastchange.vim', { 'branch': 'jranke' } " R plugin {{{2 " for vim versions <= 7.4.1453 use the legacy plugin @@ -37,16 +41,15 @@ if !has('nvim') && !exists("*job_getchannel") let vimrplugin_assign = 0 let rmd_syn_hl_chunk = 1 - "let vimrplugin_vsplit = 0 - "let vimrplugin_rconsole_width = 100 - "let vimrplugin_pdfviewer = "/usr/bin/okular" - "let vimrplugin_openpdf = 0 - "let vimrplugin_objbr_place = "script,left" + let vimrplugin_pdfviewer = "/usr/bin/okular" + let vimrplugin_openpdf = 0 else Plug 'jalvesaq/Nvim-R' vmap r <Esc>:call SendSelectionToR("echo", "down")<CR> let R_vsplit = 1 let R_assign = 0 + let R_pdfviewer = 'okular' + let R_openpdf = 0 endif " 2}}} @@ -107,3 +110,16 @@ call airline#parts#define_function('syntax', 'SyntaxItem') let g:airline_section_x=airline#section#create_right(['syntax', 'filetype']) " Always show statusline {{{1 set laststatus=2 +" Mappings for easier navigation of windows {{{1 +" From :help terminal-emulator-input in neovim +nnoremap <A-h> <C-w>h +nnoremap <A-j> <C-w>j +nnoremap <A-k> <C-w>k +nnoremap <A-l> <C-w>l +if has('nvim') + tnoremap <A-h> <C-\><C-n><C-w>h + tnoremap <A-j> <C-\><C-n><C-w>j + tnoremap <A-k> <C-\><C-n><C-w>k + tnoremap <A-l> <C-\><C-n><C-w>l +endif +" {{{1 vim: foldmethod=marker foldlevel=0 ts=2 sw=2 expandtab |