commit 98ca0993633fa30c04e24430849fc18b24a70f9b
parent 8c4be4c9b19a982c687ed5b3cb00cec0cc3c212a
Author: Pablo Cárdenas <pablo.cardenas@imca.edu.pe>
Date: Fri, 5 Nov 2021 17:02:39 -0500
Updated vimrc
Diffstat:
10 files changed, 29 insertions(+), 10 deletions(-)
diff --git a/.gitmodules b/.gitmodules
@@ -40,3 +40,6 @@
[submodule "pack/pablo/start/emmet-vim"]
path = pack/pablo/start/emmet-vim
url = https://github.com/mattn/emmet-vim
+[submodule "pack/pablo/start/vim-fugitive"]
+ path = pack/pablo/start/vim-fugitive
+ url = https://github.com/tpope/vim-fugitive.git
diff --git a/after/syntax/markdown/folding.vim b/after/syntax/markdown/folding.vim
@@ -0,0 +1 @@
+syntax region vimFoldCode start="^``` {" end="```$" keepend fold contains=NONE
diff --git a/ftplugin/python.vim b/ftplugin/python.vim
@@ -0,0 +1,2 @@
+map <Leader>vr :call VimuxRunCommand("clear; source venv/bin/activate; python " . bufname("%"))<CR>
+map <Leader>vo :call VimuxRunCommand("clear; source venv/bin/activate; python")<CR>
diff --git a/ftplugin/r.vim b/ftplugin/r.vim
@@ -0,0 +1,2 @@
+map <Leader>vr :call VimuxRunCommand("clear; Rscript " . bufname("%"))<CR>
+map <Leader>vo :call VimuxRunCommand("clear; R")<CR>
diff --git a/pack/pablo/start/vim-fugitive b/pack/pablo/start/vim-fugitive
@@ -0,0 +1 @@
+Subproject commit e1d382b3e7e7491acea8546ef3bdfa9ce7e54fef
diff --git a/plugin/deoplete/LanguageClient-neovim.vim b/plugin/deoplete/LanguageClient-neovim.vim
@@ -6,6 +6,7 @@ let g:LanguageClient_serverCommands = {
\ 'cpp': ['clangd', '-clang-tidy'],
\ 'python': ['pyls'],
\ 'r': ['R', '--slave', '-e', 'languageserver::run()'],
+ \ 'rmd': ['R', '--slave', '-e', 'languageserver::run()'],
\ 'tex': ['texlab'],
\ }
diff --git a/plugin/pablo/ale.vim b/plugin/pablo/ale.vim
@@ -5,7 +5,7 @@ let g:ale_linters = {
\ 'html': ['stylelint', 'tidy'],
\ 'markdown': ['proselint', 'writegood'],
\ 'plaintex': ['lacheck', 'chktex'],
-\ 'python': ['pylint', 'flake8'],
+\ 'python': ['flake8', 'mypy'],
\ 'r': ['lintr'],
\ 'sass': ['stylelint'],
\ 'tex': ['lacheck', 'chktex'],
@@ -17,7 +17,7 @@ let g:ale_fixers = {
\ 'css': ['stylelint'],
\ 'html': ['stylelint', 'tidy'],
\ 'plaintex': ['latexindent'],
-\ 'python': ['autopep8', 'yapf'],
+\ 'python': ['yapf'],
\ 'r': ['styler'],
\ 'sass': ['stylelint'],
\ 'tex': ['latexindent'],
@@ -25,3 +25,7 @@ let g:ale_fixers = {
let g:ale_fix_on_save = 1
call ale#Set('languagetool_options', '--language en-US --enable TOO_LONG_PARAGRAPH,READABILITY_RULE_SIMPLE,TOO_LONG_SENTENCE,READABILITY_RULE_DIFFICULT,HOPEFULLY,EN_PLAIN_ENGLISH_REPLACE,And,WHITESPACE_PARAGRAPH,PASSIVE_VOICE,THREE_NN,EMPTY_LINE,PARAGRAPH_REPEAT_BEGINNING_RULE --disable WHITESPACE_RULE --enablecategories Wikipedia')
+
+
+nmap <silent> [a <Plug>(ale_previous_wrap)
+nmap <silent> ]a <Plug>(ale_next_wrap)
diff --git a/plugin/pablo/vimux.vim b/plugin/pablo/vimux.vim
@@ -1,5 +1,5 @@
" Run the current file with rspec
-map <Leader>rb :call VimuxRunCommand("clear; rspec " . bufname("%"))<CR>
+map <Leader>vo :call VimuxOpenRunner<CR>
" Prompt for a command to run
map <Leader>vp :VimuxPromptCommand<CR>
@@ -14,20 +14,26 @@ map <Leader>vi :VimuxInspectRunner<CR>
map <Leader>vq :VimuxCloseRunner<CR>
" Interrupt any command running in the runner pane
-map <Leader>vx :VimuxInterruptRunner<CR>
+map <Leader>v<C-c> :VimuxInterruptRunner<CR>
" Zoom the runner pane (use <bind-key> z to restore runner pane)
map <Leader>vz :call VimuxZoomRunner()<CR>
+" Clear the terminal screen of the runner pane
+map <Leader>v<C-l> :VimuxClearTerminalScreen<CR>
-" Vimux as tslime replacement
-function! VimuxSlime()
+function! VimuxSlimeNormal()
+ call VimuxSendText(getline('.'))
+ call VimuxSendKeys("Enter")
+endfunction
+
+function! VimuxSlimeVisual()
call VimuxSendText(@v)
call VimuxSendKeys("Enter")
endfunction
" If text is selected, save it in the v buffer and send that buffer it to tmux
-vmap <LocalLeader>vs "vy :call VimuxSlime()<CR>
+vmap <LocalLeader>vs "vy :call VimuxSlimeVisual()<CR>
" Select current paragraph and send it to tmux
-nmap <LocalLeader>vs vip<LocalLeader>vs<CR>
+nmap <LocalLeader>vs :call VimuxSlimeNormal()<CR>j
diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1 @@
neovim
-git+https://github.com/PyCQA/pycodestyle.git@master
-python-language-server[all]
diff --git a/vimrc b/vimrc
@@ -11,6 +11,7 @@ set wildmenu
set nowrap
set showmatch
set number
+set mouse=
set undofile
