Merge commit 'f035c9318b23aea7479c124d749f5678c060e7b3'

dots/.config/nvim/after/ftplugin/pandoc/sandwich.vim.lua

@@ -0,0 +1,37 @@
+vim.cmd([[
+function GetClozeNumber()
+  let REGEX_CLOZE_START = '{{c\d\+::'
+
+  " Find previous cloze match
+  let prev_match = searchpos(REGEX_CLOZE_START, 'bW', line("gg"))
+  " Only get number if cloze was matched (i.e. when cursor does not end up at
+  " start of file)
+  if max(prev_match) != 0
+    " Get word under cursor (ignoring curly braces and `::`),
+    " get the second character of the word and cast it to an int
+    " add one for the next cloze number
+    return str2nr(expand("<cword>")[1]) + 1
+  else
+    return 1
+  endif
+endfunction
+
+" Wrap the next cloze number
+function GetClozeStart()
+  return "{{c" . GetClozeNumber() . "::"
+endfunction
+
+function GetClozeEnd()
+  return "}}"
+endfunction
+
+let g:sandwich#recipes += [
+      \   {
+      \     'buns':     ['GetClozeStart()', 'GetClozeEnd()'],
+      \     'expr'    : 1,
+      \     'filetype': ['pandoc'],
+      \     'input':    ['c'],
+      \     'nesting':  1
+      \   }
+      \ ]
+]])

dots/.config/nvim/after/plugin/md-img-paste.vim.lua

@@ -0,0 +1,5 @@
+vim.cmd([[
+" Paste clipboard images
+au FileType pandoc nmap <buffer><silent> <leader>v :call mdip#MarkdownClipboardImage()<CR>
+au FileType markdown nmap <buffer><silent> <leader>v :call mdip#MarkdownClipboardImage()<CR>
+]])

dots/.config/nvim/after/plugin/nvim-lint.lua

@@ -1,3 +1,5 @@
+vim.env.ESLINT_D_PPID = vim.fn.getpid()
+
 local eslint_linter = "eslint_d"
 
 require("lint").linters_by_ft = {

dots/.config/nvim/after/plugin/sandwich.vim.lua

@@ -0,0 +1,5 @@
+vim.cmd([[
+nmap s <Nop>
+xmap s <Nop>
+let g:sandwich#recipes = deepcopy(g:sandwich#default_recipes)
+]])

dots/.config/nvim/after/plugin/taskwiki.vim.lua

@@ -0,0 +1,6 @@
+vim.cmd([[
+let g:taskwiki_taskrc_location='/home/h/.config/task/taskrc'
+let g:taskwiki_disable_concealcursor=1
+let g:taskwiki_dont_preserve_folds=1
+let g:taskwiki_dont_fold=1
+]])

dots/.config/nvim/after/plugin/vim-javascript.vim.lua

@@ -0,0 +1,8 @@
+vim.cmd([[
+let g:javascript_plugin_jsdoc = 1 " jsdoc syntax highlighting
+let g:javascript_plugin_flow = 1 " flow syntax highlighting
+let g:javascript_conceal_function = "ƒ"
+let g:javascript_conceal_return = "⇖"
+let g:svelte_indent_script = 0
+let g:svelte_indent_style = 0
+]])

dots/.config/nvim/after/plugin/vim-pandoc-syntax.vim.lua

@@ -0,0 +1,17 @@
+vim.cmd([[
+let g:pandoc#syntax#conceal#urls=1
+let g:pandoc#syntax#codeblocks#embeds#langs=[
+  \ 'python',
+  \ 'bash',
+  \ 'javascript',
+  \ 'typescript',
+  \ 'html',
+  \ 'css',
+  \ 'scss',
+  \ 'json',
+  \ 'yaml'
+  \ ]
+let g:pandoc#syntax#style#emphases=0 " Bug workaround
+let g:pandoc#syntax#conceal#cchar_overrides = { "atx": " ", "li": "·" }
+let g:pandoc#syntax#conceal#blacklist=[]
+]])

dots/.config/nvim/after/plugin/vim-pandoc.vim.lua

@@ -0,0 +1,9 @@
+vim.cmd([[
+au FileType pandoc call pandoc#completion#Init()
+let g:pandoc#filetypes#pandoc_markdown=0
+let g:pandoc#spell#enabled=0
+let g:pandoc#spell#default_langs=['en_us', 'nl_be']
+let g:pandoc#formatting#mode='a'
+let g:pandoc#formatting#textwidth=90
+let g:pandoc#modules#disabled = ["formatting", "dashes", "yaml", "metadata"]
+]])

dots/.config/nvim/after/plugin/vim-tidal.vim.lua

@@ -0,0 +1,16 @@
+vim.cmd([[
+" Tidalcycles (sclang and vim-tidal)
+let g:tidal_default_config = {"socket_name": "default", "target_pane": "tidal:1.1"}
+let g:tidal_no_mappings = 1
+
+au FileType tidal nm <buffer> <leader>ep <Plug>TidalParagraphSend
+au FileType tidal nm <buffer> <leader>ee <Plug>TidalLineSend
+au FileType tidal nnoremap <buffer> <leader>h :TidalHush<cr>
+au FileType tidal com! -nargs=1 S :TidalSilence <args>
+au FileType tidal com! -nargs=1 P :TidalPlay <args>
+au FileType tidal com! -nargs=0 H :TidalHush
+
+" SuperCollider
+au BufEnter,BufWinEnter,BufNewFile,BufRead *.sc,*.scd se filetype=supercollider
+au Filetype supercollider packadd scvim
+]])

dots/.config/nvim/after/plugin/vimtex.vim.lua

@@ -0,0 +1,6 @@
+vim.cmd([[
+let g:vimtex_view_method='zathura'
+let g:tex_flavor='latex'
+let g:tex_conceal='abdmgs'
+let g:vimtex_quickfix_mode=0
+]])

dots/.config/nvim/after/plugin/wiki.vim.lua

@@ -0,0 +1,110 @@
+vim.cmd([[
+" Change local buffer to directory of current file after the plugin has loaded
+autocmd VimEnter * lcd %:p:h
+
+" " Override wiki index mapping to also cd into the wiki
+nm <leader>ww <plug>(wiki-index)
+" nm <leader>l <plug>(wiki-next-link)
+" nm <leader>h <plug>(wiki-prev-link)
+" nm <leader>j <plug>(wiki-link-follow)
+" nm <leader>k <plug>(wiki-link-return)
+" nm <leader>s <plug>(wiki-link-follow-split)
+" nm <leader>v <plug>(wiki-link-follow-vsplit)
+
+autocmd BufEnter *.md if expand('%:t') =~ '_' | echo 'hierarchical relation' | endif
+autocmd BufEnter *.md if expand('%:t') =~ '--' | echo 'relation' | endif
+autocmd BufEnter *.md if expand('%:t') =~ '<>' | echo 'dichotomy' | endif
+autocmd BufEnter *.md if expand('%:t') =~ 'my-' | echo 'personal file' | endif
+autocmd BufEnter *.md if expand('%:t') =~ 'project_' | echo 'project file' | endif
+
+" Only load wiki.vim for zk directory
+let g:wiki_index_name='index'
+
+" Links
+let g:wiki_link_extension=''
+" Do not automatically transform to link, use `<leader>wf` for this
+let g:wiki_link_target_type='md'
+
+vmap <leader>wf <plug>(wiki-link-toggle-visual)
+
+"
+" Links
+"
+
+"
+" Options
+"
+
+"
+" Events
+"
+
+"
+" Mappings and commands
+"
+
+"
+" Completion
+"
+
+let g:wiki_completion_enabled=1
+let g:wiki_completion_case_sensitive=0
+
+"
+" Tags
+"
+
+"
+" Templates
+"
+
+let g:wiki_templates = [
+      \ { 'match_re': '^my-',
+      \   'source_filename': '.my.md'},
+      \ { 'match_re': '^project[-_]',
+      \   'source_filename': '.project.md'},
+      \ { 'match_re': '^blog[-_]',
+      \   'source_filename': '.blog.md'},
+      \ { 'match_re': '^journal[-_]',
+      \   'source_filename': '.journal.md'},
+      \ { 'match_func': { x -> v:true },
+      \   'source_filename': '.md'},
+      \]
+
+"
+" Advanced configuration
+"
+
+let g:wiki_filetypes=['md']
+let g:wiki_root='~/.zk'
+let g:wiki_global_load=0
+let g:wiki_link_creation = {
+      \ 'md': {
+      \   'link_type': 'md',
+      \   'url_extension': '',
+      \   'url_transform': { x -> substitute(tolower(x), '\s\+', '-', 'g') },
+      \ },
+      \ '_': {
+      \   'link_type': 'wiki',
+      \   'url_extension': '',
+      \ },
+      \}
+
+" let g:wiki_link_default_schemes
+" let g:wiki_link_schemes
+let g:wiki_link_toggle_on_follow=0
+" let g:wiki_link_transforms
+" let g:wiki_mappings_use_defaults
+" let g:wiki_mappings_global
+" let g:wiki_mappings_local
+" let g:wiki_mappings_local_journal
+" ... tags
+" let g:wiki_template_month_names
+" let g:wiki_template_title_month = 
+" let g:wiki_template_title_week
+" let g:wiki_ui_method
+let g:wiki_write_on_nav=1
+let g:wiki_zotero_root='~/.local/share/zotero'
+" ... mappings and commands
+" ...
+]])

dots/.config/nvim/after/syntax/_comment_keywords.lua

@@ -0,0 +1,7 @@
+vim.cmd([[
+syn match Todo /TODO/
+syn match Todo /FIXME/
+syn match Todo /FIX/
+syn match Todo /QUESTION/
+syn match Todo /NOTE/
+]])

dots/.config/nvim/after/syntax/pandoc.lua

@@ -0,0 +1,26 @@
+vim.cmd([[
+" Override the pandoc-syntax highlighting colors for more subtle citations
+hi! link pandocPCite Comment
+hi! link pandocICite Comment
+hi! link pandocCiteKey Comment
+hi! link pandocCiteAnchor Comment
+hi! link pandocCiteLocator Comment
+
+" Match cloze delimiters e.g. `{{c1::` and `}}`
+syn match ClozeDelimiter /{{c\d\+::/ conceal containedin=pandocUListItem,pandocListItem
+syn match ClozeDelimiter /}}/ conceal containedin=pandocUListItem,pandocListItem
+" Match text between cloze delimiters
+syn match Cloze /\({{c\d\+::\)\@<=\(\_[A-Za-z0-9$\ \\\-\*,_`()]*\)\(}}\)\@=/ containedin=pandocUListItem,pandocListItem
+
+hi! link ClozeDelimiter Special
+hi! link Cloze Special
+
+" Fix task UUIDs not being highlighted correctly in pandoc lists
+syn match pandocUListItem /^>\=\s*[*+-]\s\+-\@!.*$/ nextgroup=pandocUListItem,pandocLaTeXMathBlock,pandocLaTeXInlineMath,pandocEscapedDollar,pandocDelimitedCodeBlock,pandocListItemContinuation contains=@Spell,pandocEmphasis,pandocStrong,pandocNoFormatted,pandocStrikeout,pandocSubscript,pandocSuperscript,pandocStrongEmphasis,pandocStrongEmphasis,pandocPCite,pandocICite,pandocCiteKey,pandocReferenceLabel,pandocLaTeXCommand,pandocLaTeXMathBlock,pandocLaTeXInlineMath,pandocEscapedDollar,pandocReferenceURL,pandocAutomaticLink,pandocFootnoteDef,pandocFootnoteBlock,pandocFootnoteID,pandocAmpersandEscape,TaskWikiTaskUuid skipempty display
+syn match TaskWikiTaskUuid containedin=TaskWikiTask /\v#([A-Z]:)?[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$/
+syn match TaskWikiTaskUuid containedin=TaskWikiTask /\v#([A-Z]:)?[0-9a-fA-F]{8}$/
+highlight link TaskWikiTaskUuid Comment
+
+]])
+
+vim.cmd.runtime("syntax/_comment_keywords.lua")

dots/.config/nvim/after/syntax/prolog.lua

@@ -0,0 +1,7 @@
+vim.cmd([[
+syn keyword Operator \+ conceal cchar=¬
+syn keyword Operator ,  conceal cchar=∧
+syn keyword Operator ;  conceal cchar=∨
+]])
+
+vim.cmd.runtime("syntax/_comment_keywords.lua")

dots/.config/nvim/after/syntax/scheme.lua

@@ -0,0 +1,41 @@
+vim.cmd([[
+syntax keyword Statement define conceal cchar=≔
+
+syn keyword Operator not conceal cchar=¬
+syn keyword Operator and conceal cchar=∧
+syn keyword Operator or conceal cchar=∨
+
+syn keyword Operator mod  conceal cchar=%
+syn keyword Operator exp  conceal cchar=^
+syn keyword Operator sqrt conceal cchar=√
+
+syn keyword Operator quote conceal cchar='
+
+" Conceal greek letters
+syn keyword Operator alpha   conceal cchar=α
+syn keyword Operator beta    conceal cchar=β
+syn keyword Operator gamma   conceal cchar=γ
+syn keyword Operator delta   conceal cchar=δ
+syn keyword Operator epsilon conceal cchar=ε
+syn keyword Operator zeta    conceal cchar=ζ
+syn keyword Operator eta     conceal cchar=η
+syn keyword Operator theta   conceal cchar=θ
+syn keyword Operator iota    conceal cchar=ι
+syn keyword Operator kappa   conceal cchar=κ
+syn keyword Operator lambda  conceal cchar=λ
+syn keyword Operator mu      conceal cchar=μ
+syn keyword Operator nu      conceal cchar=ν
+syn keyword Operator xi      conceal cchar=ξ
+syn keyword Operator omicron conceal cchar=ο
+syn keyword Operator pi      conceal cchar=π
+syn keyword Operator rho     conceal cchar=ρ
+syn keyword Operator sigma   conceal cchar=σ
+syn keyword Operator tau     conceal cchar=τ
+syn keyword Operator upsilon conceal cchar=υ
+syn keyword Operator phi     conceal cchar=φ
+syn keyword Operator chi     conceal cchar=χ
+syn keyword Operator psi     conceal cchar=ψ
+syn keyword Operator omega   conceal cchar=ω
+]])
+
+vim.cmd.runtime("syntax/_comment_keywords.lua")