From 6f280c5198386265b37aa1d7cd7e86f3f7550a85 Mon Sep 17 00:00:00 2001 From: Chris Date: Sun, 17 May 2020 15:41:15 -0400 Subject: react comments hack --- .gitignore | 1 + init.vim | 62 ++++++++++++++++++++++++++++++++++++++++++ keys/which-key.vim | 52 +++++++++++++++++++++++++++++++++-- plug-config/nerd-commenter.vim | 31 ++------------------- themes/eleline.vim | 7 ----- vim-plug/plugins.vim | 4 ++- 6 files changed, 118 insertions(+), 39 deletions(-) delete mode 100644 themes/eleline.vim diff --git a/.gitignore b/.gitignore index e7ce79f8..db1d8dff 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,5 @@ nodepath.vim autoload/plugged/* session general/paths.vim +wiki/ diff --git a/init.vim b/init.vim index 71fab25f..ef2e9753 100644 --- a/init.vim +++ b/init.vim @@ -42,4 +42,66 @@ else endif " Experimental + +" Codi let g:codi#rightalign=0 + +" VimWiki + let g:vimwiki_key_mappings = + \ { + \ 'all_maps': 0, + \ 'global': 0, + \ 'headers': 0, + \ 'text_objs': 0, + \ 'table_format': 0, + \ 'table_mappings': 0, + \ 'lists': 0, + \ 'links': 0, + \ 'html': 0, + \ 'mouse': 0, + \ } + +" Filetypes enabled for +let g:vimwiki_filetypes = ['markdown', 'pandoc'] + +let g:vimwiki_auto_header = 0 +let g:vimwiki_markdown_header_style = 1 +let g:vimwiki_tags_header_level = 1 +let g:vimwiki_tags_header = 'Generated Tags' +let g:vimwiki_links_header_level = 1 +let g:vimwiki_links_header = 'Generated Links' +let g:vimwiki_auto_chdir = 0 +let g:vimwiki_map_prefix = 'w' +let g:vimwiki_toc_link_format = 0 +let g:vimwiki_toc_header_level = 1 +let g:vimwiki_toc_header = 'Contents' +let g:vimwiki_autowriteall = 1 +let g:vimwiki_conceal_pre = 0 +let g:vimwiki_conceal_onechar_markers = 1 +let g:vimwiki_conceallevel = 2 +let g:vimwiki_user_htmls = '' +let g:vimwiki_valid_html_tags = 'b,i,s,u,sub,sup,kbd,br,hr' +let g:vimwiki_html_header_numbering_sym = '' +let g:vimwiki_html_header_numbering = 0 +let g:vimwiki_dir_link = '' +let g:vimwiki_markdown_link_ext = 0 +let g:vimwiki_create_link = 1 +let g:vimwiki_use_calendar = 1 +let g:vimwiki_text_ignore_newline = 1 +let g:vimwiki_list_ignore_newline = 1 +let g:vimwiki_folding = '' +let g:vimwiki_listsym_rejected = '✗' +let g:vimwiki_listsyms = '✗○◐●✓' +let g:vimwiki_global_ext = 1 +let g:vimwiki_hl_cb_checked = 0 +let g:vimwiki_list = [{'path': '~/my_site/', 'exclude_files': ['**/README.md']}] + + + + +let g:vimwiki_diary_months = { + \ 1: 'January', 2: 'February', 3: 'March', + \ 4: 'April', 5: 'May', 6: 'June', + \ 7: 'July', 8: 'August', 9: 'September', + \ 10: 'October', 11: 'November', 12: 'December' + \ } diff --git a/keys/which-key.vim b/keys/which-key.vim index a7ff908a..efe2fa03 100644 --- a/keys/which-key.vim +++ b/keys/which-key.vim @@ -1,5 +1,5 @@ " Map leader to which_key -nnoremap :silent WhichKey '' +nnoremap :silent :silent WhichKey '' vnoremap :silent :silent WhichKeyVisual '' " Create map to add keys to @@ -25,7 +25,7 @@ autocmd FileType which_key set laststatus=0 noshowmode noruler " Single mappings -let g:which_key_map['/'] = [ 'NERDCommenterToggle' , 'comment' ] +let g:which_key_map['/'] = [ ':Commentary' , 'comment' ] let g:which_key_map['.'] = [ ':e $MYVIMRC' , 'open init' ] let g:which_key_map[';'] = [ ':Commands' , 'commands' ] let g:which_key_map['='] = [ '=' , 'balance windows' ] @@ -39,7 +39,7 @@ let g:which_key_map['r'] = [ ':RnvimrToggle' , 'ranger' ] let g:which_key_map['S'] = [ ':SSave' , 'save session' ] let g:which_key_map['T'] = [ ':Rg' , 'search text' ] let g:which_key_map['v'] = [ 'v' , 'split right'] -let g:which_key_map['w'] = [ 'w' , 'write' ] +let g:which_key_map['W'] = [ 'w' , 'write' ] let g:which_key_map['z'] = [ 'Goyo' , 'zen' ] " Group mappings @@ -180,6 +180,52 @@ let g:which_key_map.t = { \ 's' : [':FloatermNew ncdu' , 'ncdu'], \ } +" w is for wiki +let g:which_key_map.w = { + \ 'name' : '+wiki' , + \ 'w' : ['VimwikiIndex' , 'ncdu'], + \ 'n' : ['(wiki-open)' , 'ncdu'], + \ 'j' : ['(wiki-journal)' , 'ncdu'], + \ 'R' : ['(wiki-reload)' , 'ncdu'], + \ 'c' : ['(wiki-code-run)' , 'ncdu'], + \ 'b' : ['(wiki-graph-find-backlinks)' , 'ncdu'], + \ 'g' : ['(wiki-graph-in)' , 'ncdu'], + \ 'G' : ['(wiki-graph-out)' , 'ncdu'], + \ 'l' : ['(wiki-link-toggle)' , 'ncdu'], + \ 'd' : ['(wiki-page-delete)' , 'ncdu'], + \ 'r' : ['(wiki-page-rename)' , 'ncdu'], + \ 't' : ['(wiki-page-toc)' , 'ncdu'], + \ 'T' : ['(wiki-page-toc-local)' , 'ncdu'], + \ 'e' : ['(wiki-export)' , 'ncdu'], + \ 'u' : ['(wiki-list-uniq)' , 'ncdu'], + \ 'U' : ['(wiki-list-uniq-local)' , 'ncdu'], + \ } + +" Global +" VimwikiIndex +" VimwikiTabIndex +" VimwikiUISelect +" VimwikiDiaryIndex +" VimwikiMakeDiaryNote +" VimwikiTabMakeDiaryNote +" VimwikiMakeYesterdayDiaryNote +" VimwikiMakeTomorrowDiaryNote +" +" " Local +" Vimwiki2HTML +" Vimwiki2HTMLBrowse +" VimwikiDiaryGenerateLinks +" VimwikiFollowLink +" VimwikiSplitLink +" VimwikiVSplitLink +" VimwikiTabnewLink +" VimwikiGoBackLink +" VimwikiNextLink +" VimwikiPrevLink +" VimwikiGoto +" VimwikiDeleteLink +" VimwikiRenameLink +" VimwikiAddHeaderLevel " Register which key map call which_key#register('', "g:which_key_map") diff --git a/plug-config/nerd-commenter.vim b/plug-config/nerd-commenter.vim index 8b054e34..1a581a53 100644 --- a/plug-config/nerd-commenter.vim +++ b/plug-config/nerd-commenter.vim @@ -1,28 +1,3 @@ - -" nnoremap / :Commentary -" vnoremap / :Commentary - -let g:NERDCreateDefaultMappings = 0 -" Add spaces after comment delimiters by default -let g:NERDSpaceDelims = 1 - -" Use compact syntax for prettified multi-line comments -let g:NERDCompactSexyComs = 1 - -" Align line-wise comment delimiters flush left instead of following code indentation -let g:NERDDefaultAlign = 'left' - -" Set a language to use its alternate delimiters by default -let g:NERDAltDelims_java = 1 - -" Add your own custom formats or override the defaults -let g:NERDCustomDelimiters = { 'c': { 'left': '/**','right': '*/' } } - -" Allow commenting and inverting empty lines (useful when commenting a region) -let g:NERDCommentEmptyLines = 1 - -" Enable trimming of trailing whitespace when uncommenting -let g:NERDTrimTrailingWhitespace = 1 - -" Enable NERDCommenterToggle to check all selected lines is commented or not -let g:NERDToggleCheckAllLines = 1 +" nnoremap / :Commentary +vnoremap / :Commentary +autocmd FileType javascript.jsx setlocal commentstring={/*\ %s\ */} diff --git a/themes/eleline.vim b/themes/eleline.vim deleted file mode 100644 index cc817df4..00000000 --- a/themes/eleline.vim +++ /dev/null @@ -1,7 +0,0 @@ -let g:eleline_powerline_fonts = 1 -" Always show tabs - -set showtabline=2 - -" We don't need to see things like -- INSERT -- anymore -set noshowmode diff --git a/vim-plug/plugins.vim b/vim-plug/plugins.vim index ec3e7a15..2b9bec31 100644 --- a/vim-plug/plugins.vim +++ b/vim-plug/plugins.vim @@ -19,7 +19,8 @@ call plug#begin('~/.config/nvim/autoload/plugged') " Surround Plug 'tpope/vim-surround' " Better Comments - Plug 'preservim/nerdcommenter' + Plug 'tpope/vim-commentary' + " Plug 'preservim/nerdcommenter' " Have the file system follow you around Plug 'airblade/vim-rooter' " auto set indent settings @@ -88,6 +89,7 @@ call plug#begin('~/.config/nvim/autoload/plugged') " Plug 'Shougo/echodoc.vim' " Interactive code Plug 'metakirby5/codi.vim' + Plug 'https://github.com/vimwiki/vimwiki.git' endif -- cgit v1.2.3