diff options
| -rw-r--r-- | .vim/autoload/zettel.vim | 38 | ||||
| -rw-r--r-- | .vim/ftdetect/zettel.vim | 4 | ||||
| -rw-r--r-- | .vim/init.vim | 15 | ||||
| -rw-r--r-- | .vim/plug.vim | 3 |
4 files changed, 13 insertions, 47 deletions
diff --git a/.vim/autoload/zettel.vim b/.vim/autoload/zettel.vim deleted file mode 100644 index 87fb32c..0000000 --- a/.vim/autoload/zettel.vim +++ /dev/null @@ -1,38 +0,0 @@ -" note taking helpers -" to aide in practicing the zettelkasten.de system -" -" ref: https://vimways.org/2019/personal-notetaking-in-vim/ - -let g:zettel_dir = $HOME.'/wiki' -let g:zettel_ext = '.md' - -func! zettel#is_zettel(fpath) - if a:fpath =~ g:zettel_dir . '/.*' . g:zettel_ext . '$' | return 1 | en - return 0 -endfunc - -func! zettel#set_filetype() - silent exec 'setlocal filetype=zettel' -endfunc - -func! zettel#edit(...) - let l:fname = expand(g:zettel_dir) . '/' - \ . strftime('%Y') . '/' - \ . tolower(strftime('%m-%b')) . g:zettel_ext - - silent exec 'e ' . l:fname -endfunc - - -func! zettel#newday() - let linenr = line('$') - " backtrace to last non-empty line - while empty(getline(linenr)) - let linenr -= 1 - endwhile - let e = append(linenr, ['', '---', '', strftime('# %d/%m/%y')]) - if !e - let &modified = 1 - endif - silent execute 'normal ' . line('$'). 'gg2o' -endfunc diff --git a/.vim/ftdetect/zettel.vim b/.vim/ftdetect/zettel.vim deleted file mode 100644 index ecf6a0e..0000000 --- a/.vim/ftdetect/zettel.vim +++ /dev/null @@ -1,4 +0,0 @@ -augroup zettel_file - au! - au BufNewFile,BufRead * if zettel#is_zettel(expand('%:p')) | call zettel#set_filetype() | en -augroup END diff --git a/.vim/init.vim b/.vim/init.vim index e9d8e7b..dc091a3 100644 --- a/.vim/init.vim +++ b/.vim/init.vim @@ -236,6 +236,15 @@ let g:UltiSnipsExpandTrigger = "<tab>" " let g:UltiSnipsListSnippets = "<c-tab>" let g:UltiSnipsJumpForwardTrigger = "<c-n>" let g:UltiSnipsJumpBackwardTrigger = "<c-p>" + +let g:vimwiki_main = {} +let g:vimwiki_main.path = '~/wiki/' +let g:vimwiki_main.syntax = 'markdown' +let g:vimwiki_main.ext = '.md' +let g:vimwiki_main.name = 'wiki' +let g:vimwiki_main.index = '_index' +let g:vimwiki_list = [vimwiki_main] +let g:vimwiki_folding = 'list' " }}}1 " lsp + compl {{{1 @@ -315,7 +324,8 @@ augroup SpecialBuffers au FileType fzf,skim tnoremap <buffer><esc> <c-c> au FileType gitmessengerpopup nmap <buffer><esc> <Plug>(git-messenger-close) au FileType vista nmap <buffer><space> :wincmd p<CR> - au FileType help,qf nmap <buffer>q <c-w><c-q> + au FileType help,qf,vista nmap <buffer>q <c-w><c-q> + au FileType vimwik if filereadable(expand('%')) | read !zet new | endif augroup END " augroup AutoSaveFolds @@ -347,6 +357,3 @@ command! -bang DayMode call daymode#switch(<bang>0) command! -range Retab <line1>,<line2>call retab#do() command! NumberToggle call numbertoggle#switch() command! Alternate call alternate#alternate() - -command! -nargs=* Zet call zettel#edit(<f-args>) -command! ZetDay call zettel#newday() diff --git a/.vim/plug.vim b/.vim/plug.vim index 280ea34..64ca543 100644 --- a/.vim/plug.vim +++ b/.vim/plug.vim @@ -26,6 +26,7 @@ call plug#begin('~/.vim/plugged') Plug 'SirVer/ultisnips' \| Plug 'honza/vim-snippets' + Plug 'vimwiki/vimwiki' " search " Plug 'junegunn/fzf', @@ -81,6 +82,6 @@ call plug#begin('~/.vim/plugged') " Local " Plug '~/devel/projects/nihon-theme/vim' - Plug '~/devel/projects/vim-orgdown' + " Plug '~/devel/projects/vim-orgdown' call plug#end() |