Merge branch 'main' into slim

3 files changed, 22 insertions, 0 deletions

diff --git a/bashrc b/bashrc
index 4cc51d7..19f7590 100644
--- a/bashrc
+++ b/bashrc
@@ -89,3 +89,22 @@ export PATH
 export RETICULATE_PYTHON=/usr/bin/python3
 export RETICULATE_AUTOCONFIGURE=FALSE 
 # }}}
+# ripgrep->fzf->vim [QUERY] from https://junegunn.github.io/fzf/tips/ripgrep-integration/
+rfv() (
+  RELOAD='reload:rg --column --color=always --smart-case {q} || :'
+  OPENER='if [[ $FZF_SELECT_COUNT -eq 0 ]]; then
+            vim {1} +{2}     # No selection. Open the current line in Vim.
+          else
+            vim +cw -q {+f}  # Build quickfix list for the selected items.
+          fi'
+  fzf --disabled --ansi --multi \
+      --bind "start:$RELOAD" --bind "change:$RELOAD" \
+      --bind "enter:become:$OPENER" \
+      --bind "ctrl-o:execute:$OPENER" \
+      --bind 'alt-a:select-all,alt-d:deselect-all,ctrl-/:toggle-preview' \
+      --delimiter : \
+      --preview 'bat --style=full --color=always --highlight-line {2} {1}' \
+      --preview-window '~4,+{2}+4/3,<80(up)' \
+      --query "$*"
+)
+
diff --git a/gitignore b/gitignore
index b9cea99..3c0a6f2 100644
--- a/gitignore
+++ b/gitignore
@@ -12,3 +12,4 @@
 ~$*.xlk*
 ~$*.ppt*
 
+.wine/dosdevices/**
diff --git a/vimrc b/vimrc
index 33a067b..1a3f4b2 100644
--- a/vimrc
+++ b/vimrc
@@ -70,6 +70,8 @@ let cmdline_map_start = '<LocalLeader>s'
 " R plugin {{{1
 Plug 'jalvesaq/Nvim-R'
 vmap r <Esc>:call SendSelectionToR("echo", "down")<CR>
+imap ,, <SPACE>\|><CR>
+vmap ,, a \|><CR>
 let R_assign = 0
 let R_pdfviewer = 'okular'
 let R_openpdf = 1