From 861b9a0471ba38c2d3ec9ee793e88cd8d3f36bbe Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Thu, 26 Nov 2020 15:35:30 +0100 Subject: Use better diff, move Renviron to Rprofile --- Renviron | 3 --- Rprofile | 5 +++++ gitconfig | 18 +++++++++--------- install | 2 +- 4 files changed, 15 insertions(+), 13 deletions(-) delete mode 100644 Renviron diff --git a/Renviron b/Renviron deleted file mode 100644 index 92b13cf..0000000 --- a/Renviron +++ /dev/null @@ -1,3 +0,0 @@ -R_CHECK_CRAN_INCOMING_REMOTE=false -NOT_CRAN=true -LANGUAGE=en diff --git a/Rprofile b/Rprofile index 680ea2e..0925c49 100644 --- a/Rprofile +++ b/Rprofile @@ -12,6 +12,11 @@ local({ options(repos = r) }) +# littler does not read .Renviron, therefore do this here +Sys.setenv(LANGUAGE = "en") +Sys.setenv(R_CHECK_CRAN_INCOMING_REMOTE = FALSE) +Sys.setenv(NOT_CRAN = TRUE) + # For (re)installing PythonInR #Sys.setenv(USESPECIALPYTHONVERSION="python3") diff --git a/gitconfig b/gitconfig index cd68b80..103b345 100644 --- a/gitconfig +++ b/gitconfig @@ -1,16 +1,16 @@ # vim: ft=gitconfig [user] - name = Johannes Ranke - email = jranke@uni-bremen.de + name = Johannes Ranke + email = jranke@uni-bremen.de signingkey = E19F 5F87 1288 99B1 92B1 A2C2 AD5F 960A 256A 04AF [push] - default = simple + default = simple [core] - excludesfile = ~/.gitignore - autocrlf = input - pager = less -S + excludesfile = ~/.gitignore + autocrlf = input + pager = /usr/share/doc/git/contrib/diff-highlight/diff-highlight | less --tabs=4 -RFX [merge] - tool = vimdiff + tool = vimdiff [url "git@salsa.debian.org:"] - pushInsteadOf = https://salsa.debian.org/ - insteadOf = salsa: + pushInsteadOf = https://salsa.debian.org/ + insteadOf = salsa: diff --git a/install b/install index c519e97..e35190d 100755 --- a/install +++ b/install @@ -6,7 +6,7 @@ cd $(dirname $BASH_SOURCE) BASE=$(pwd) # dotfiles to install -for dotfile in bashrc vimrc gitconfig gitignore Rprofile Renviron tmux.conf reportbugrc; do +for dotfile in bashrc vimrc gitconfig gitignore Rprofile tmux.conf reportbugrc; do mkdir -pv bak [ -e ~/.$dotfile ] && mv -v ~/.$dotfile bak/.$dotfile ln -sfv $BASE/$dotfile ~/.$dotfile -- cgit v1.2.1