# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1708110741 18000
# Node ID a945ff0fd02f7a462f2235289cdffd8f2b32cc52
# Parent  c55540587f763293a0d91f4b58d3799325981357
More

diff -r c55540587f76 -r a945ff0fd02f .hgsub
--- a/.hgsub	Fri Feb 02 15:00:52 2024 -0500
+++ b/.hgsub	Fri Feb 16 14:12:21 2024 -0500
@@ -19,6 +19,7 @@
 vim/bundle/neoformat             = [git]https://github.com/sbdchd/neoformat
 vim/bundle/nerdtree              = [git]https://github.com/scrooloose/nerdtree
 vim/bundle/nextflow-vim          = [git]https://github.com/sjl/nextflow-vim
+vim/bundle/nvim-r                = [git]https://github.com/jamespeapen/Nvim-R/
 vim/bundle/paredit               = [git]https://github.com/kovisoft/paredit
 vim/bundle/pgsql                 = [git]https://github.com/exu/pgsql.vim
 vim/bundle/python-mode           = [git]https://github.com/klen/python-mode
diff -r c55540587f76 -r a945ff0fd02f .hgsubstate
--- a/.hgsubstate	Fri Feb 02 15:00:52 2024 -0500
+++ b/.hgsubstate	Fri Feb 16 14:12:21 2024 -0500
@@ -19,6 +19,7 @@
 964c66fa22500ae7375114342d212d7fe15da341 vim/bundle/neoformat
 9310f91476a94ee9c2f3a587171893743a343e26 vim/bundle/nerdtree
 47f6d8508757559fcfa8f49cd93cd5c86ce847f0 vim/bundle/nextflow-vim
+f68f7745fe92429d1fa080a8a7d6d6075be9f752 vim/bundle/nvim-r
 c76e0987ec45c84103b408691ec0506e7b99cb30 vim/bundle/paredit
 1a436f7d875b4ec630da081b041c73264235c7e7 vim/bundle/pgsql
 d241974f40e8d206f9970e51fb0069951862ba35 vim/bundle/python-mode
diff -r c55540587f76 -r a945ff0fd02f bin/fnums
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/fnums	Fri Feb 16 14:12:21 2024 -0500
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+# Field Numbers, because I'm sick of manually counting
+
+head -n 1 "$@" | tr -s ',\t' '\n\n' | nl
diff -r c55540587f76 -r a945ff0fd02f stumpwmrc
--- a/stumpwmrc	Fri Feb 02 15:00:52 2024 -0500
+++ b/stumpwmrc	Fri Feb 16 14:12:21 2024 -0500
@@ -501,6 +501,9 @@
 (defcommand clear-notifications () ()
   (run-shell-command "dunstctl close-all"))
 
+(defcommand rstudio () ()
+  (run-shell-command "rstudio"))
+
 (defcommand start-vm () ()
   (echo "Starting VM.")
   (run-shell-command "/home/sjl/vms/run"))
@@ -732,7 +735,7 @@
   ("H-g" "gcontrol")
   ("H-f" "save-fucked-screenshot")
   ("H-F" "delete-fucked-screenshot")
-  ("H-R" "loadrc")
+  ("H-R" "rstudio")
   ("H-r" "rain")
   ("H-V" "vlc")
   ("H-e" "budget")
diff -r c55540587f76 -r a945ff0fd02f vim/custom-dictionary.utf-8.add
--- a/vim/custom-dictionary.utf-8.add	Fri Feb 02 15:00:52 2024 -0500
+++ b/vim/custom-dictionary.utf-8.add	Fri Feb 16 14:12:21 2024 -0500
@@ -410,3 +410,9 @@
 webapp
 webapps
 B2
+ggplot2
+AMRFinder
+AMRFinderPlus
+BI545
+PIBS800
+isoforms
diff -r c55540587f76 -r a945ff0fd02f vim/vimrc
--- a/vim/vimrc	Fri Feb 02 15:00:52 2024 -0500
+++ b/vim/vimrc	Fri Feb 16 14:12:21 2024 -0500
@@ -216,7 +216,7 @@
 " Filetype-specific ------------------------------------------------------- {{{
 
 " April {{{
-"
+
 augroup ft_commonlisp_april " {{{
     au!
 
@@ -230,6 +230,7 @@
     au FileType lisp inoremap <buffer> <c-j>1  ¨
     au FileType lisp inoremap <buffer> <c-j>F  ⍨
     au FileType lisp inoremap <buffer> <c-j>P  ⍣
+    au FileType lisp inoremap <buffer> <c-j>R  ⍤
 
     au FileType lisp inoremap <buffer> <c-j>*  ×
     au FileType lisp inoremap <buffer> <c-j>/  ÷
@@ -249,8 +250,8 @@
     au FileType lisp inoremap <buffer> <c-j>d  ∆
     au FileType lisp inoremap <buffer> <c-j>D  ⍙
 
-    au FileType lisp inoremap <buffer> <c-j>G^ ⍋
-    au FileType lisp inoremap <buffer> <c-j>Gv ⍒
+    au FileType lisp inoremap <buffer> <c-j>Gk ⍋
+    au FileType lisp inoremap <buffer> <c-j>Gj ⍒
 
     au FileType lisp inoremap <buffer> <c-j>oo  ○
     au FileType lisp inoremap <buffer> <c-j>o\| ⌽
@@ -922,11 +923,6 @@
     au FileType go iabbrev <buffer> enilrs if err != nil {<cr>return "", err<down>
     au FileType go iabbrev <buffer> enilrz if err != nil {<cr>return 0, err<down>
 
-    au FileType go iabbrev <buffer> enilrw if err != nil {<cr>return fmt.Errorf(": %w", err<left><left><left><left><left><left><left><left><left><left><C-R>=Eatchar('\s')<cr>
-    au FileType go iabbrev <buffer> enilrwn if err != nil {<cr>return nil, fmt.Errorf(": %w", err<left><left><left><left><left><left><left><left><left><left><C-R>=Eatchar('\s')<cr>
-    au FileType go iabbrev <buffer> enilrws if err != nil {<cr>return "", fmt.Errorf(": %w", err<left><left><left><left><left><left><left><left><left><left><C-R>=Eatchar('\s')<cr>
-    au FileType go iabbrev <buffer> enilrwz if err != nil {<cr>return 0, fmt.Errorf(": %w", err<left><left><left><left><left><left><left><left><left><left><C-R>=Eatchar('\s')<cr>
-
     au FileType gohtmltmpl setlocal shiftwidth=4
 augroup END
 
@@ -1282,6 +1278,44 @@
 augroup END
 
 " }}}
+" R {{{
+
+let R_external_term = 'st -t "R REPL" --'
+let R_args = ['--no-save', '--quiet']
+let R_save_win_pos = 0
+let R_arrange_windows = 0
+let R_assign_map = 0
+let R_clear_line = 1
+let R_nvim_wd = 1
+let R_user_maps_only = 1
+let R_nvimpager = 'vertical'
+let R_help_w = 81
+
+function! s:customNvimRMappings()
+   " Normal Mode
+   nmap <buffer> <localleader>Or <Plug>RStart
+   nmap <buffer> <localleader>Cr <Plug>RClose
+   nmap <buffer> <localleader>c  <Plug>RClearConsole
+   nmap <buffer> <localleader>h  <Plug>RHelp
+   nmap <buffer> M               <Plug>RHelp
+   nmap <buffer> <localleader>e  <Plug>RSendParagraph
+   nmap <buffer> <localleader>E  <Plug>RSendLine
+   nmap <buffer> <localleader>f  <Plug>RSendFile
+   nmap <buffer> <localleader>i  <Plug>RViewDFv
+   nmap <buffer> <localleader>I  <Plug>RViewDFs
+   nmap <buffer> gi              <Plug>RIndent
+
+   " Visual Mode
+   vmap <buffer> <localleader>e  <Plug>RSendSelection
+endfunction
+
+augroup ft_r
+    au!
+
+    autocmd filetype r call s:customNvimRMappings()
+augroup END
+
+" }}}
 " Sh {{{
 
 function! SendShellParagraph() "{{{