diff options
| -rw-r--r-- | bashrc | 17 | ||||
| -rw-r--r-- | vimrc | 14 |
2 files changed, 13 insertions, 18 deletions
@@ -23,23 +23,6 @@ export RPYTHON_PYTHON_VERSION=3 # python3-uno from RPython PATH=/usr/lib/libreoffice/program:"${PATH}" -# Vim-R-plugin -# From r-plugin-bash-setup help page in Vim-R-plugin (Debian package 1.2-1) -# Change the TERM environment variable (to get 256 colors) and make Vim -# connect to th X Server even if running in a terminal emulator (many of -# the plugin features depend on this). Now only needed for "old" vim -# like vim 7.4 from Debian stable -if [ "x$DISPLAY" != "x" ] -then - if [ "screen" = "$TERM" ] - then - export TERM=screen-256color - else - export TERM=xterm-256color - fi - alias vim='vim --servername VIM' -fi - 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: Tue Sep 12, 2017 at 09:52 AM +0200 +" 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,7 @@ 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") @@ -58,6 +59,17 @@ else "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> +let R_assign = 0 +let R_pdfviewer = 'okular' +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() |