X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/80e1e6396316f56a64a1772f0acafe449b87b074..e081ae2be04bf7224eadc202f3b9e821d65a440b:/vim/vimrc

diff --git a/vim/vimrc b/vim/vimrc
index a7e23ac..bd479a7 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -4,6 +4,11 @@ if has('python3') | endif
 " space is leader
 let g:mapleader = " "
 
+" disable netrw
+"FIXME: it currently breaks vim-fugitive 2023-04-11
+" instead of opening Git status, a netrw buffer opens instead
+let g:loaded_netrwPlugin = 1
+
 " runtimepath {{{1
 set runtimepath ^=$XDG_CONFIG_HOME/vim
 set runtimepath +=$XDG_CONFIG_HOME/vim/after
@@ -213,7 +218,6 @@ Plug 'derekwyatt/vim-fswitch'
 Plug 'elzr/vim-json'
 Plug 'firef0x/pkgbuild.vim'
 Plug 'junegunn/vim-easy-align'
-Plug 'klen/python-mode'
 Plug 'kshenoy/vim-signature'
 " Plug 'majutsushi/tagbar' " TODO: delete? {{{2
 "   map <F5> :TagbarToggle<cr>
@@ -289,6 +293,23 @@ Plug 'mtth/scratch.vim'  " {{{2
   let g:scratch_autohide = 0
 "}}}
 
+Plug 'vim-pandoc/vim-pandoc'  " {{{2
+Plug 'vim-pandoc/vim-pandoc-syntax'
+let g:pandoc#syntax#conceal#use = 1
+let g:pandoc#syntax#conceal#blacklist = [
+    \ 'titleblock',
+    \ 'codeblock_start',
+    \ 'codeblock_delim',
+    \ 'atx',
+    \ ]
+let g:pandoc#syntax#codeblocks#embeds#langs = [
+    \ 'plantuml',
+    \ ]
+let g:pandoc#keyboard#blacklist_submodule_mappings = [
+    \ 'para',
+    \ ]
+"}}}
+
 " Plug 'jenterkin/vim-autosource'  " TODO: delete? {{{2
 "   let g:autosource_hashdir = $XDG_CACHE_HOME . '/vim/vim-autosource'
 "   let g:autosource_conf_names = ['.vimrc', '.vimrc.lua']
@@ -625,6 +646,9 @@ nnoremap <silent> <leader>ww :Untrail<CR>
 " Source
 vnoremap <leader>S y:execute @@<cr>:echo 'Sourced selection.'<cr>
 nnoremap <leader>S ^vg_y:execute @@<cr>:echo 'Sourced line.'<cr>
+" Technically this is similar to execute this file, which is usually mapped to
+" <leader>r and it would make sense to have that for lua files in nvim folder
+nnoremap <leader>SS :source %<cr>:echo 'Sourced file.'<cr>
 
 " jump to last cursor position
 noremap ' `
@@ -745,7 +769,7 @@ vnoremap <leader><Space> zf
 cabbrev w!! SudoWrite
 
 " uppercase previous word
-inoremap <C-C> <Esc>gUiwgi
+inoremap <C-C> <C-G>u<Esc>gUiwgi
 
 " http://git.io/v3ZeU
 nmap <silent> <leader>qq :echo "hi<" . synIDattr(synID(line("."),col("."),1),"name") . '> trans<' . synIDattr(synID(line("."),col("."),0),"name") . "> lo<" . synIDattr(synIDtrans(synID(line("."),col("."),1)),"name") . ">"<CR>
@@ -827,15 +851,8 @@ nmap <silent> cog <Plug>IndentGuidesToggle
 nmap <silent> [og <Plug>IndentGuidesEnable
 nmap <silent> ]og <Plug>IndentGuidesDisable
 
-" python-mode {{{2
-
-let g:pymode_rope_completion = 0
-let g:pymode_rope = 0
-let g:pymode_run = 0
-let g:pymode_folding = 1
-let g:pymode_lint_ignore = "E221,E266,E501"
-let g:pymode_lint_cwindow = 0           " don't open cwindow when linting
-let g:pymode_syntax_space_errors = 0    " don't bother me when I'm typing
+" netrw {{{2
+let g:netrw_sort_sequence = '[\/]$,\.\%(h\|hpp\)$,\.c$,\.cpp$,\~\=\*$,*,\.o$,\.obj$,\.info$,\.swp$,\.bak$,\~$'
 
 " signature {{{2
 " disable '[ mappings
@@ -911,8 +928,10 @@ nnoremap <silent> gs :<C-U>set operatorfunc=SortLinesOpFunc<CR>g@
 vnoremap <silent> gs :sort<cr>
 
 " edit configs  {{{2
+" TODO: populate location list with both .vim and .lua files
+" TODO: create file if it doesn't exist in nvim or vim rtps
 function! EditConfig(what, ext = '.vim')
-    if a:what == 'vimrc'
+    if a:what == 'vimrc' || a:what == 'init.lua'
         let l:file = a:what
     elseif empty(&filetype)
         echoe 'filetype is empty!'
@@ -923,6 +942,7 @@ function! EditConfig(what, ext = '.vim')
 
     execute ':Vvsplit! '.file
 endf
+nmap <leader>en :call EditConfig('init.lua')<CR>
 nmap <leader>ev :call EditConfig('vimrc')<CR>
 nmap <leader>ef :call EditConfig('ftplugin')<CR>
 nmap <leader>es :call EditConfig('syntax')<CR>