3 files changed, 66 insertions, 30 deletions
diff --git a/plug-config/fzf.vim b/plug-config/fzf.vim
index 2e40f6e4..fbb5457f 100644
--- a/plug-config/fzf.vim
+++ b/plug-config/fzf.vim
@@ -22,7 +22,7 @@ let g:fzf_tags_command = 'ctags -R'
 " Border color
 let g:fzf_layout = {'up':'~90%', 'window': { 'width': 0.8, 'height': 0.8,'yoffset':0.5,'xoffset': 0.5, 'highlight': 'Todo', 'border': 'sharp' } }
 
-let $FZF_DEFAULT_OPTS = '--layout=reverse --info=inline'
+let $FZF_DEFAULT_OPTS = '--layout=reverse --inline-info'
 let $FZF_DEFAULT_COMMAND="rg --files --hidden --glob '!.git/**'"
 "-g '!{node_modules,.git}'
 
@@ -44,7 +44,7 @@ let g:fzf_colors =
 
 "Get Files
 command! -bang -nargs=? -complete=dir Files
-    \ call fzf#vim#files(<q-args>, fzf#vim#with_preview({'options': ['--layout=reverse', '--info=inline']}), <bang>0)
+    \ call fzf#vim#files(<q-args>, fzf#vim#with_preview({'options': ['--layout=reverse', '--inline-info']}), <bang>0)
 
 
 " Get text in files with Rg
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 <space>/ :Commentary<CR>
-" vnoremap <space>/ :Commentary<CR>
-
-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 <silent> <space>/ :Commentary<CR>
+vnoremap <silent> <space>/ :Commentary<CR>
+autocmd FileType javascript.jsx setlocal commentstring={/*\ %s\ */}
diff --git a/plug-config/vim-wiki.vim b/plug-config/vim-wiki.vim
new file mode 100644
index 00000000..5e693fc2
--- /dev/null
+++ b/plug-config/vim-wiki.vim
@@ -0,0 +1,61 @@
+" VimWiki
+  let g:vimwiki_key_mappings =
+    \ {
+    \   'all_maps': 1,
+    \   'global': 1,
+    \   'headers': 1,
+    \   'text_objs': 1,
+    \   'table_format': 1,
+    \   'table_mappings': 1,
+    \   'lists': 1,
+    \   'links': 1,
+    \   'html': 1,
+    \   'mouse': 1,
+    \ }
+
+" Filetypes enabled for
+let g:vimwiki_filetypes = ['markdown']
+
+let g:vimwiki_list = [{'path': '~/.config/nvim/wiki',
+                      \ 'syntax': 'markdown', 'ext': '.md', 'exclude_files': ['**/README.md', '**/Readme.md'] }]
+
+" 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 = '<Leader>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_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'
+      \ }