diff options
| -rw-r--r-- | bashrc | 3 | ||||
| -rw-r--r-- | vimrc | 34 |
2 files changed, 34 insertions, 3 deletions
@@ -20,6 +20,9 @@ PATH=/usr/local/lib/R/site-library/littler/examples:"${PATH}" # RPython export RPYTHON_PYTHON_VERSION=3 +# python3-uno from RPython +PATH=/usr/lib/libreoffice/program:"${PATH}" + alias tarxz='tar --use-compress-program=pxz -c -v -f' # Path where the R sources are @@ -1,5 +1,5 @@ " vimrc of Johannes Ranke -" Last Change: Mon Jan 22, 2018 at 05:19 PM +0100 +" Last Change: Mon Jan 22, 2018 at 05:28 PM +0100 " default settings (much is handled by tpope/sensible) {{{1 set ts=2 set sw=2 @@ -33,6 +33,33 @@ Plug 'jranke/lastchange.vim', { 'branch': 'jranke' } Plug 'vim-scripts/DeleteTrailingWhitespace' " R plugin {{{2 +<<<<<<< HEAD +" for vim versions <= 7.4.1453 use the legacy plugin +" Note that on wheezy, vim is too old even for that +if !has('nvim') && !exists("*job_getchannel") + Plug 'jcfaria/Vim-R-plugin', { 'commit': 'd726d619f12a10fb5ac7967d373837735cff60f0' } + + let vimrplugin_map_r = 1 " is silent per default, therefore tried + "vnoremap r *@<Esc>:call SendSelectionToR("echo", "down")<CR> + " but this does not work as expected + + let vimrplugin_assign = 0 + let rmd_syn_hl_chunk = 1 + let vimrplugin_pdfviewer = "/usr/bin/okular" + let vimrplugin_openpdf = 0 +else + Plug 'jalvesaq/Nvim-R' + "Plug '~/git/Nvim-R', { 'branch': 'rstudio' } + vmap r <Esc>:call SendSelectionToR("echo", "down")<CR> + let R_assign = 0 + let R_pdfviewer = 'okular' + let R_openpdf = 0 + let R_min_editor_width = 100 + let R_rconsole_width = 80 + "let R_in_buffer = 0 + "let RStudio_cmd = '/usr/bin/rstudio' +endif +======= Plug 'jalvesaq/Nvim-R' "Plug '~/git/Nvim-R', { 'branch': 'rstudio' } vmap r <Esc>:call SendSelectionToR("echo", "down")<CR> @@ -42,6 +69,7 @@ let R_openpdf = 0 let R_min_editor_width = 100 "let R_in_buffer = 0 "let RStudio_cmd = '/usr/bin/rstudio' +>>>>>>> ebd7e9bbbaed28f36472fe520c98c44c36175d24 " 2}}} call plug#end() @@ -87,7 +115,7 @@ map <F10> :echo "hi<" . synIDattr(synID(line("."),col("."),1),"name") . '> trans \ . synIDattr(synID(line("."),col("."),0),"name") . "> lo<" \ . synIDattr(synIDtrans(synID(line("."),col("."),1)),"name") . ">"<CR> -" Show syntax highlighting group in status line +" Show syntax highlighting group in status line " http://vim.wikia.com/wiki/Showing_syntax_highlight_group_in_statusline function! SyntaxItem() return synIDattr(synID(line("."),col("."),1),"name") @@ -108,7 +136,7 @@ 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') +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 |