cleaner

.gitignore

@@ -1,4 +1,3 @@
 plugged
-plugins
 plugin
 .netrwhist

after/ftplugin/markdown.vim

@@ -0,0 +1,34 @@
+function! Title_level(lnum) 
+	let l:line = getline(a:lnum)
+	let l:hash = matchstr(l:line, '^#*')
+	let l:count = len(l:hash)
+	return l:count
+endfunction
+
+function! Is_empty(lnum) 
+	let l:line = getline(a:lnum)
+	if match(l:line, '^\s*$') != -1
+		return 1
+	endif
+	return 0
+endfunction
+
+function! Markdown_fold(lnum)
+	let l:level = Title_level(a:lnum)
+	if l:level != 0
+		return max([l:level - 1, 0])
+	endif
+	let l:empty = Is_empty(a:lnum)
+	if l:empty == 1
+		let l:next_level = Title_level(a:lnum + 1)
+		if l:next_level != 0
+			return max([l:next_level - 2, 0])
+		endif
+	endif
+	let l:prev_fold = foldlevel(a:lnum - 1)
+	" return l:prev_fold
+	return "="
+endfunction
+
+setlocal foldmethod=expr
+setlocal foldexpr=Markdown_fold(v:lnum)

after/ftplugin/python.vim

@@ -1,5 +1,3 @@
 set expandtab
 let b:ale_linters = ['flake8']
-" let b:ale_linters = ['pylint']
+let b:ale_fixers = ['black', 'remove_trailing_lines', 'trim_whitespace',]
-" let b:ale_linters = ['flake8', 'pylint']
-let b:ale_fixers = ['black']

after/syntax/markdown.vim

@@ -0,0 +1,178 @@
+" Read the HTML syntax to start with
+if v:version < 600
+  so <sfile>:p:h/html.vim
+else
+  runtime! syntax/html.vim
+
+  if exists('b:current_syntax')
+    unlet b:current_syntax
+  endif
+endif
+
+if v:version < 600
+  syntax clear
+elseif exists('b:current_syntax')
+  finish
+endif
+
+" don't use standard HiLink, it will not work with included syntax files
+if v:version < 508
+  command! -nargs=+ HtmlHiLink hi link <args>
+else
+  command! -nargs=+ HtmlHiLink hi def link <args>
+endif
+
+syn spell toplevel
+syn case ignore
+syn sync linebreaks=1
+
+let s:conceal = ''
+let s:concealends = ''
+let s:concealcode = ''
+if has('conceal') && get(g:, 'vim_markdown_conceal', 1)
+  let s:conceal = ' conceal'
+  let s:concealends = ' concealends'
+endif
+if has('conceal') && get(g:, 'vim_markdown_conceal_code_blocks', 1)
+  let s:concealcode = ' concealends'
+endif
+
+" additions to HTML groups
+if get(g:, 'vim_markdown_emphasis_multiline', 1)
+    let s:oneline = ''
+else
+    let s:oneline = ' oneline'
+endif
+syn region mkdItalic matchgroup=mkdItalic start="\%(\*\|_\)"    end="\%(\*\|_\)"
+syn region mkdBold matchgroup=mkdBold start="\%(\*\*\|__\)"    end="\%(\*\*\|__\)"
+syn region mkdBoldItalic matchgroup=mkdBoldItalic start="\%(\*\*\*\|___\)"    end="\%(\*\*\*\|___\)"
+execute 'syn region htmlItalic matchgroup=mkdItalic start="\%(^\|\s\)\zs\*\ze[^\\\*\t ]\%(\%([^*]\|\\\*\|\n\)*[^\\\*\t ]\)\?\*\_W" end="[^\\\*\t ]\zs\*\ze\_W" keepend contains=@Spell' . s:oneline . s:concealends
+execute 'syn region htmlItalic matchgroup=mkdItalic start="\%(^\|\s\)\zs_\ze[^\\_\t ]" end="[^\\_\t ]\zs_\ze\_W" keepend contains=@Spell' . s:oneline . s:concealends
+execute 'syn region htmlBold matchgroup=mkdBold start="\%(^\|\s\)\zs\*\*\ze\S" end="\S\zs\*\*" keepend contains=@Spell' . s:oneline . s:concealends
+execute 'syn region htmlBold matchgroup=mkdBold start="\%(^\|\s\)\zs__\ze\S" end="\S\zs__" keepend contains=@Spell' . s:oneline . s:concealends
+execute 'syn region htmlBoldItalic matchgroup=mkdBoldItalic start="\%(^\|\s\)\zs\*\*\*\ze\S" end="\S\zs\*\*\*" keepend contains=@Spell' . s:oneline . s:concealends
+execute 'syn region htmlBoldItalic matchgroup=mkdBoldItalic start="\%(^\|\s\)\zs___\ze\S" end="\S\zs___" keepend contains=@Spell' . s:oneline . s:concealends
+
+" [link](URL) | [link][id] | [link][] | ![image](URL)
+syn region mkdFootnotes matchgroup=mkdDelimiter start="\[^"    end="\]"
+execute 'syn region mkdID matchgroup=mkdDelimiter    start="\["    end="\]" contained oneline' . s:conceal
+execute 'syn region mkdURL matchgroup=mkdDelimiter   start="("     end=")"  contained oneline' . s:conceal
+execute 'syn region mkdLink matchgroup=mkdDelimiter  start="\\\@<!!\?\[\ze[^]\n]*\n\?[^]\n]*\][[(]" end="\]" contains=@mkdNonListItem,@Spell nextgroup=mkdURL,mkdID skipwhite' . s:concealends
+
+" Autolink without angle brackets.
+" mkd  inline links:      protocol     optional  user:pass@  sub/domain                    .com, .co.uk, etc         optional port   path/querystring/hash fragment
+"                         ------------ _____________________ ----------------------------- _________________________ ----------------- __
+syn match   mkdInlineURL /https\?:\/\/\(\w\+\(:\w\+\)\?@\)\?\([A-Za-z0-9][-_0-9A-Za-z]*\.\)\{1,}\(\w\{2,}\.\?\)\{1,}\(:[0-9]\{1,5}\)\?[^] \t]*/
+
+" Autolink with parenthesis.
+syn region  mkdInlineURL matchgroup=mkdDelimiter start="(\(https\?:\/\/\(\w\+\(:\w\+\)\?@\)\?\([A-Za-z0-9][-_0-9A-Za-z]*\.\)\{1,}\(\w\{2,}\.\?\)\{1,}\(:[0-9]\{1,5}\)\?[^] \t]*)\)\@=" end=")"
+
+" Autolink with angle brackets.
+syn region mkdInlineURL matchgroup=mkdDelimiter start="\\\@<!<\ze[a-z][a-z0-9,.-]\{1,22}:\/\/[^> ]*>" end=">"
+
+" Link definitions: [id]: URL (Optional Title)
+syn region mkdLinkDef matchgroup=mkdDelimiter   start="^ \{,3}\zs\[\^\@!" end="]:" oneline nextgroup=mkdLinkDefTarget skipwhite
+syn region mkdLinkDefTarget start="<\?\zs\S" excludenl end="\ze[>[:space:]\n]"   contained nextgroup=mkdLinkTitle,mkdLinkDef skipwhite skipnl oneline
+syn region mkdLinkTitle matchgroup=mkdDelimiter start=+"+     end=+"+  contained
+syn region mkdLinkTitle matchgroup=mkdDelimiter start=+'+     end=+'+  contained
+syn region mkdLinkTitle matchgroup=mkdDelimiter start=+(+     end=+)+  contained
+
+"HTML headings
+syn region htmlH1       matchgroup=mkdHeading     start="^\s*#"                   end="$" contains=mkdLink,mkdInlineURL,@Spell
+syn region htmlH2       matchgroup=mkdHeading     start="^\s*##"                  end="$" contains=mkdLink,mkdInlineURL,@Spell
+syn region htmlH3       matchgroup=mkdHeading     start="^\s*###"                 end="$" contains=mkdLink,mkdInlineURL,@Spell
+syn region htmlH4       matchgroup=mkdHeading     start="^\s*####"                end="$" contains=mkdLink,mkdInlineURL,@Spell
+syn region htmlH5       matchgroup=mkdHeading     start="^\s*#####"               end="$" contains=mkdLink,mkdInlineURL,@Spell
+syn region htmlH6       matchgroup=mkdHeading     start="^\s*######"              end="$" contains=mkdLink,mkdInlineURL,@Spell
+syn match  htmlH1       /^.\+\n=\+$/ contains=mkdLink,mkdInlineURL,@Spell
+syn match  htmlH2       /^.\+\n-\+$/ contains=mkdLink,mkdInlineURL,@Spell
+
+"define Markdown groups
+syn match  mkdLineBreak    /  \+$/
+syn region mkdBlockquote   start=/^\s*>/                   end=/$/ contains=mkdLink,mkdInlineURL,mkdLineBreak,@Spell
+execute 'syn region mkdCode matchgroup=mkdCodeDelimiter start=/\(\([^\\]\|^\)\\\)\@<!`/                     end=/`/'  . s:concealcode
+execute 'syn region mkdCode matchgroup=mkdCodeDelimiter start=/\(\([^\\]\|^\)\\\)\@<!``/ skip=/[^`]`[^`]/   end=/``/' . s:concealcode
+execute 'syn region mkdCode matchgroup=mkdCodeDelimiter start=/^\s*\z(`\{3,}\)[^`]*$/                       end=/^\s*\z1`*\s*$/'            . s:concealcode
+execute 'syn region mkdCode matchgroup=mkdCodeDelimiter start=/\(\([^\\]\|^\)\\\)\@<!\~\~/  end=/\(\([^\\]\|^\)\\\)\@<!\~\~/'               . s:concealcode
+execute 'syn region mkdCode matchgroup=mkdCodeDelimiter start=/^\s*\z(\~\{3,}\)\s*[0-9A-Za-z_+-]*\s*$/      end=/^\s*\z1\~*\s*$/'           . s:concealcode
+execute 'syn region mkdCode matchgroup=mkdCodeDelimiter start="<pre\(\|\_s[^>]*\)\\\@<!>"                   end="</pre>"'                   . s:concealcode
+execute 'syn region mkdCode matchgroup=mkdCodeDelimiter start="<code\(\|\_s[^>]*\)\\\@<!>"                  end="</code>"'                  . s:concealcode
+syn region mkdFootnote     start="\[^"                     end="\]"
+syn match  mkdCode         /^\s*\n\(\(\s\{8,}[^ ]\|\t\t\+[^\t]\).*\n\)\+/
+syn match  mkdCode         /\%^\(\(\s\{4,}[^ ]\|\t\+[^\t]\).*\n\)\+/
+syn match  mkdCode         /^\s*\n\(\(\s\{4,}[^ ]\|\t\+[^\t]\).*\n\)\+/ contained
+syn match  mkdListItem     /^\s*\%([-*+]\|\d\+\.\)\ze\s\+/ contained nextgroup=mkdListItemCheckbox
+syn match  mkdListItemCheckbox     /\[[xXoO ]\]\ze\s\+/ contained contains=mkdListItem
+syn region mkdListItemLine start="^\s*\%([-*+]\|\d\+\.\)\s\+" end="$" oneline contains=@mkdNonListItem,mkdListItem,mkdListItemCheckbox,@Spell
+syn region mkdNonListItemBlock start="\(\%^\(\s*\([-*+]\|\d\+\.\)\s\+\)\@!\|\n\(\_^\_$\|\s\{4,}[^ ]\|\t+[^\t]\)\@!\)" end="^\(\s*\([-*+]\|\d\+\.\)\s\+\)\@=" contains=@mkdNonListItem,@Spell
+syn match  mkdRule         /^\s*\*\s\{0,1}\*\s\{0,1}\*\(\*\|\s\)*$/
+syn match  mkdRule         /^\s*-\s\{0,1}-\s\{0,1}-\(-\|\s\)*$/
+syn match  mkdRule         /^\s*_\s\{0,1}_\s\{0,1}_\(_\|\s\)*$/
+
+" YAML frontmatter
+if get(g:, 'vim_markdown_frontmatter', 0)
+  syn include @yamlTop syntax/yaml.vim
+  syn region Comment matchgroup=mkdDelimiter start="\%^---$" end="^\(---\|\.\.\.\)$" contains=@yamlTop keepend
+  unlet! b:current_syntax
+endif
+
+if get(g:, 'vim_markdown_toml_frontmatter', 0)
+  try
+    syn include @tomlTop syntax/toml.vim
+    syn region Comment matchgroup=mkdDelimiter start="\%^+++$" end="^+++$" transparent contains=@tomlTop keepend
+    unlet! b:current_syntax
+  catch /E484/
+    syn region Comment matchgroup=mkdDelimiter start="\%^+++$" end="^+++$"
+  endtry
+endif
+
+if get(g:, 'vim_markdown_json_frontmatter', 0)
+  try
+    syn include @jsonTop syntax/json.vim
+    syn region Comment matchgroup=mkdDelimiter start="\%^{$" end="^}$" contains=@jsonTop keepend
+    unlet! b:current_syntax
+  catch /E484/
+    syn region Comment matchgroup=mkdDelimiter start="\%^{$" end="^}$"
+  endtry
+endif
+
+if get(g:, 'vim_markdown_math', 0)
+  syn include @tex syntax/tex.vim
+  syn region mkdMath start="\\\@<!\$" end="\$" skip="\\\$" contains=@tex keepend
+  syn region mkdMath start="\\\@<!\$\$" end="\$\$" skip="\\\$" contains=@tex keepend
+endif
+
+" Strike through
+if get(g:, 'vim_markdown_strikethrough', 0)
+    execute 'syn region mkdStrike matchgroup=htmlStrike start="\%(\~\~\)" end="\%(\~\~\)"' . s:concealends
+    HtmlHiLink mkdStrike        htmlStrike
+endif
+
+syn cluster mkdNonListItem contains=@htmlTop,htmlItalic,htmlBold,htmlBoldItalic,mkdFootnotes,mkdInlineURL,mkdLink,mkdLinkDef,mkdLineBreak,mkdBlockquote,mkdCode,mkdRule,htmlH1,htmlH2,htmlH3,htmlH4,htmlH5,htmlH6,mkdMath,mkdStrike
+
+"highlighting for Markdown groups
+HtmlHiLink mkdString           String
+HtmlHiLink mkdCode             String
+HtmlHiLink mkdCodeDelimiter    String
+HtmlHiLink mkdCodeStart        String
+HtmlHiLink mkdCodeEnd          String
+HtmlHiLink mkdFootnote         Comment
+HtmlHiLink mkdBlockquote       Comment
+HtmlHiLink mkdListItem         Identifier
+HtmlHiLink mkdListItemCheckbox Identifier
+HtmlHiLink mkdRule             Identifier
+HtmlHiLink mkdLineBreak        Visual
+HtmlHiLink mkdFootnotes        htmlLink
+HtmlHiLink mkdLink             htmlLink
+HtmlHiLink mkdURL              htmlString
+HtmlHiLink mkdInlineURL        htmlLink
+HtmlHiLink mkdID               Identifier
+HtmlHiLink mkdLinkDef          mkdID
+HtmlHiLink mkdLinkDefTarget    mkdURL
+HtmlHiLink mkdLinkTitle        htmlString
+HtmlHiLink mkdDelimiter        Delimiter
+
+let b:current_syntax = 'mkd'
+
+delcommand HtmlHiLink
+" vim: ts=8

after/syntax/python.vim

@@ -0,0 +1 @@
+set colorcolumn=89

plugins/paint.vim

@@ -0,0 +1 @@
+Subproject commit 1b6f95e61fdfe642f9cd0695dae017a58068ddc7

plugins/sep.vim

@@ -0,0 +1 @@
+Subproject commit 1b6f95e61fdfe642f9cd0695dae017a58068ddc7

vimrc

@@ -15,7 +15,8 @@ colorscheme solarized
 " }}}
 " plugins {{{
 call plug#begin('~/.vim/plugged')
-Plug '~/.vim/plugins/*'
+Plug '~/.vim/plugins/paint.vim'
+Plug '~/.vim/plugins/sep.vim'
 Plug 'wannesm/wmgraphviz.vim'
 Plug 'weirongxu/plantuml-previewer.vim'
 Plug 'aklt/plantuml-syntax'
@@ -44,6 +45,7 @@ Plug 'SirVer/ultisnips'
 Plug 'junegunn/fzf'
 Plug 'junegunn/fzf.vim'
 Plug 'dhruvasagar/vim-table-mode'
+Plug 'tmhedberg/SimpylFold'
 
 call plug#end()
 
@@ -88,7 +90,7 @@ au TermOpen * setlocal nonumber
 
 " }}}
 " variables {{{
-let g:python3_host_prog="~/.env/bin/python"
+" let g:python3_host_prog="~/.env/bin/python"
 let g:netrw_liststyle = 4
 let g:netrw_banner = 0
 let g:slime_target = "tmux"
@@ -103,14 +105,9 @@ let g:lightline = {
 	\ }
 let g:dirvish_dovish_map_keys = 0
 let g:ale_lint_on_save = 1
-let g:ale_fix_on_save = 1
+let g:ale_fix_on_save = 0
-let b:ale_fixers = {
+let g:ale_python_auto_virtualenv = 1
-			\ '*': ['remove_trailing_lines', 'trim_whitespace'],
+let g:ale_python_flake8_use_global = 0
-			\ 'python': ['black']
-			\ }
-let b:ale_linters = {
-			\'python' : ['flake8']
-			\ }
 " }}}
 " mappings {{{
 nnoremap <expr> x ((foldclosed('.')==-1)?('x'):('zo0x'))
@@ -128,8 +125,8 @@ nmap <backspace> <Plug>(dirvish_up)
 nnoremap <leader>? :echom "hi<" . synIDattr(synID(line("."),col("."),1),"name") . '> trans<'
 \ . synIDattr(synID(line("."),col("."),0),"name") . "> lo<"
 \ . synIDattr(synIDtrans(synID(line("."),col("."),1)),"name") . ">"<CR>
-nnoremap <leader>gn :GitGutterNextHunk
+" nnoremap <leader>gn :GitGutterNextHunk
-nnoremap <leader>gN :GitGutterPreviousHunk
+" nnoremap <leader>gN :GitGutterPreviousHunk
 nmap <C-A> <nop>
 vmap <C-A> <nop>
 nmap <C-X> <nop>
@@ -138,6 +135,8 @@ nnoremap <C-W>right :tabn
 nnoremap <C-W>left :tabp
 nnoremap <C-W>c :tabnew
 nnoremap <C-W>x :tabclose
+nnoremap gn :GitGutterNextHunk<CR>
+nnoremap gp :GitGutterPreviousHunk<CR>
 
 " }}}
 " autocommands {{{