summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Rprofile2
-rw-r--r--bashrc3
-rwxr-xr-xbin/git_diff4
-rw-r--r--gitconfig2
-rw-r--r--vimrc8
5 files changed, 13 insertions, 6 deletions
diff --git a/Rprofile b/Rprofile
index 3c8fa82..81866b0 100644
--- a/Rprofile
+++ b/Rprofile
@@ -18,7 +18,7 @@ Sys.setenv(R_CHECK_CRAN_INCOMING_REMOTE = "false")
Sys.setenv(NOT_CRAN = "true")
# For (re)installing PythonInR
-#Sys.setenv(USESPECIALPYTHONVERSION="python3")
+Sys.setenv(USESPECIALPYTHONVERSION="python3")
if (interactive()) {
suppressMessages(require(reprex))
diff --git a/bashrc b/bashrc
index af89809..36009fc 100644
--- a/bashrc
+++ b/bashrc
@@ -121,4 +121,7 @@ shopt -s checkwinsize
# make less more friendly for non-text input files, see lesspipe(1)
[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
# }}}
+# {{{ PATH again
+PATH=~/.local/bin:"${PATH}"
+# }}}
export EDITOR PATH
diff --git a/bin/git_diff b/bin/git_diff
index 8b6d242..a35fc68 100755
--- a/bin/git_diff
+++ b/bin/git_diff
@@ -4,10 +4,10 @@
# From https://stackoverflow.com/a/7669988/3805440, thanks
# side-by-side diff with custom options:
-#/usr/bin/sdiff -w200 -l "$2" "$5"
+/usr/bin/sdiff -w200 -l "$2" "$5"
# using kdiff3 as the side-by-side diff:
-/usr/bin/kdiff3 "$2" "$5"
+#/usr/bin/kdiff3 "$2" "$5"
# using Meld
#/usr/bin/meld "$2" "$5"
diff --git a/gitconfig b/gitconfig
index 42275e1..58271a2 100644
--- a/gitconfig
+++ b/gitconfig
@@ -9,7 +9,7 @@
excludesfile = ~/.gitignore
autocrlf = input
[diff]
- external = ~/bin/git_diff
+# external = ~/bin/git_diff
[merge]
tool = vimdiff
[url "git@salsa.debian.org:"]
diff --git a/vimrc b/vimrc
index d03e749..060c2c5 100644
--- a/vimrc
+++ b/vimrc
@@ -1,5 +1,5 @@
" vimrc of Johannes Ranke
-" Last Change: Wed Jan 13, 2021 at 10:16 AM +0100
+" Last Change: Sat Feb 27, 2021 at 11:39 AM +0100
" default settings (much is handled by tpope/sensible) {{{1
set ts=2
set sw=2
@@ -64,8 +64,9 @@ let R_openpdf = 1
let R_min_editor_width = 100
let R_rconsole_width = 80
"let R_rmdchunk = '``'
-let R_debug = 0
+"let R_debug = 0
"let RStudio_cmd = '/usr/bin/rstudio'
+
Plug 'mllg/vim-devtools-plugin'
" The following is adapted from issue https://github.com/jalvesaq/Nvim-R/issues/476
@@ -76,6 +77,9 @@ endfunction
nmap ,rx :call StartRdevel()<CR>
+" julia
+Plug 'JuliaEditorSupport/julia-vim'
+
call plug#end()
" R syntax {{{1

Contact - Imprint