diff options
| -rw-r--r-- | README.md | 13 | ||||
| -rw-r--r-- | bashrc | 19 | ||||
| -rwxr-xr-x | bin/rda_diff | 4 | ||||
| -rw-r--r-- | gitconfig | 2 | ||||
| -rw-r--r-- | vimrc | 14 |
5 files changed, 29 insertions, 23 deletions
@@ -8,9 +8,16 @@ cd dotfiles make ``` -This will download the [vim-plug](https://github.com/junegunn/vim-plug) plugin -manager from github if not already present at .vim/autoload. To install the -plugins, open vim and type +This will call the [install](install) script from this repository, which links +each configuration file from the dotfiles directory to a dotfile in the users +home directory. + +Also, it links vim configuration files to the respective +nvim configuration files, installs the official git prompt, +installs scripts from the bin directory into the users +bin directory, and finally installs the +[vim-plug](https://github.com/junegunn/vim-plug) plugin manager from github if +not already present at .vim/autoload. To install the plugins, open vim and type ```vim :PlugInstall @@ -1,17 +1,7 @@ # vim: foldmethod=marker ts=4 sw=4 # editor {{{ # Prefer neovim over vim over vi -if [ -e /usr/bin/nvim ] -then - EDITOR=/usr/bin/nvim -else - if [ -e /usr/bin/vim ] - then - EDITOR=/usr/bin/vim - else - EDITOR=/usr/bin/vi - fi -fi +EDITOR=/usr/bin/vim export EDITOR # }}} # R {{{ @@ -22,6 +12,9 @@ PATH=/usr/lib/R/site-library/littler/examples:"${PATH}" # Path where the R sources are export RTOP=~/svn/R # }}} +# Julia {{{ +alias julia='/home/jranke/git/julia/julia' +# }}} # debian {{{ export DEBEMAIL=jranke@uni-bremen.de export DEBFULLNAME="Johannes Ranke" @@ -98,3 +91,7 @@ export VIRTUALENVWRAPPER_PYTHON=/usr/bin/python3 export VIRTUALENVWRAPPER_VIRTUALENV_ARGS=' -p /usr/bin/python3 ' source /usr/local/bin/virtualenvwrapper.sh # }}} +# {{{ reticulate +export RETICULATE_PYTHON=/usr/bin/python3 +export RETICULATE_AUTOCONFIGURE=FALSE +# }}} diff --git a/bin/rda_diff b/bin/rda_diff index c8546be..10d6e58 100755 --- a/bin/rda_diff +++ b/bin/rda_diff @@ -3,7 +3,7 @@ # # Author: Johannes Ranke <johannes.ranke@jrwb.de> # ULR: https://github.com/jranke/dotfiles/bin/rda_diff -# Last Change: Fri May 12, 2023 at 04:36 PM +0200 +# Last Change: Tue Jun 20, 2023 at 08:52 AM +0200 # Load required packages {{{1 suppressMessages({ @@ -16,7 +16,7 @@ suppressMessages({ }) # Define usage in docopt syntax {{{1 -doc <- "Usage: rda_diff.R [-m --max-diffs] <reference_file> <test_file> +doc <- "Usage: rda_diff [-m --max-diffs] <reference_file> <test_file> Options: -m --max-diffs MAXDIFFS Maximum number of differences shown [default: 10]" @@ -1,7 +1,7 @@ # vim: ft=gitconfig [user] name = Johannes Ranke - email = jranke@uni-bremen.de + email = johannes.ranke@jrwb.de signingkey = E19F 5F87 1288 99B1 92B1 A2C2 AD5F 960A 256A 04AF [push] default = simple @@ -1,5 +1,5 @@ " vimrc of Johannes Ranke -" Last Change: Fri May 12, 2023 at 09:53 PM +0200 +" Last Change: Fri Dec 06, 2024 at 01:12 PM +0100 " default settings (much is handled by tpope/sensible) {{{1 set ts=2 set sw=2 @@ -28,13 +28,13 @@ Plug 'tpope/vim-sensible' Plug 'tpope/vim-scriptease' " gives me K for looking up docs in vim scripts Plug 'hrp/EnhancedCommentify' Plug 'vim-scripts/DeleteTrailingWhitespace' -Plug 'jranke/lastchange.vim', { 'branch': 'jranke' } +"Plug 'jranke/lastchange.vim', { 'branch': 'jranke' } " Appearance Plug 'vim-airline/vim-airline' Plug 'vim-airline/vim-airline-themes' -"Plug 'jalvesaq/R-Vim-runtime' +Plug 'jalvesaq/R-Vim-runtime' Plug '~/git/R-Vim-runtime' Plug 'vim-pandoc/vim-pandoc' Plug 'vim-pandoc/vim-pandoc-syntax' @@ -45,7 +45,7 @@ Plug 'seb-mueller/kwbdi.vim' " Version control Plug 'tpope/vim-fugitive' -Plug 'airblade/vim-gitgutter' +Plug 'airblade/vim-gitgutter', { 'branch': 'main' } Plug 'samoshkin/vim-mergetool' let g:mergetool_layout = 'mr' let g:mergetool_prefer_revision = 'local' @@ -60,13 +60,15 @@ Plug 'ConradIrwin/vim-bracketed-paste' " Show and manage marks Plug 'kshenoy/vim-signature' +" Wayland clipboard +Plug 'jasonccox/vim-wayland-clipboard' + " vimcmdline plugin {{{1 Plug 'jalvesaq/vimcmdline' let cmdline_map_start = '<LocalLeader>s' " R plugin {{{1 -"Plug 'jalvesaq/Nvim-R' -Plug 'jalvesaq/Nvim-R', {'branch': 'stable'} +Plug 'jalvesaq/Nvim-R' vmap r <Esc>:call SendSelectionToR("echo", "down")<CR> let R_assign = 0 let R_pdfviewer = 'okular' |