auto push

14 files changed, 150 insertions, 93 deletions

diff --git a/modules/deoplete.vim b/.old/deoplete.vim
index 4023f5fc..4023f5fc 100644
--- a/modules/deoplete.vim
+++ b/.old/deoplete.vim
diff --git a/modules/language_server.vim b/.old/language_server.vim
index 78b6a046..78b6a046 100644
--- a/modules/language_server.vim
+++ b/.old/language_server.vim
diff --git a/modules/neosnippets.vim b/.old/neosnippets.vim
index bbb5fc2a..bbb5fc2a 100644
--- a/modules/neosnippets.vim
+++ b/.old/neosnippets.vim
diff --git a/README.md b/README.md
index f1294097..fba83fde 100644
--- a/README.md
+++ b/README.md
@@ -62,7 +62,7 @@ let g:coc_node_path = expand("~/.nvm/versions/node/v12.16.1/bin/node")
 sh ~/.config/nvim/install/utils/installer.sh ~/.config/nvim/dein
 ```
 
-## Install nvim
+## Install packages
 
 You should now run `nvim` and wait while the package manager installs your plugins
 
@@ -79,11 +79,23 @@ After install open Neovim and run the following:
 
 ## CoC Language support
 
+
+You may need to do this if CoC says it can't find Javascript:
+
+```
+cd ~/.cache/dein/repos/github.com/neoclide/coc.nvim
+git clean -xfd
+yarn install --frozen-lockfile
+```
+
+[Official installation page](https://github.com/neoclide/coc.nvim/wiki/Install-coc.nvim)
+[Extensions](https://github.com/neoclide/coc.nvim/wiki/Using-coc-extensions)
+
 ## ALE Linting
 
 ## TODO 
 
-### Install this stuff
+- make better use of ftplugin
 - Document node nonsense in order to install coc
 - configure coc settings better 
 - need formatter for other languages
@@ -93,7 +105,11 @@ After install open Neovim and run the following:
 - Check out more coc extensions
 - https://github.com/voldikss/coc-todolist
 - VimWiki
+- coc explorer and coc floating terminal are pretty cool
+- look into save vim sessions
+- create keymap file and move combinations from general
 
 ## Notes
 
 install ripgrep" for gutentags to ignore .gitignore
+If you get an error like this: `gutentags: ctags job failed, returned:` remove the tags directory in `~/.cache`
diff --git a/init.vim b/init.vim
index 3e7a24f7..a804f6b8 100644
--- a/init.vim
+++ b/init.vim
@@ -2,23 +2,24 @@
 source $HOME/.config/nvim/modules/pythonpath.vim 
 source $HOME/.config/nvim/modules/nodepath.vim " Make sure to set version here
 source $HOME/.config/nvim/modules/plugins.vim
-source $HOME/.config/nvim/modules/fzf.vim
-source $HOME/.config/nvim/modules/general.vim
 source $HOME/.config/nvim/modules/theme.vim
 source $HOME/.config/nvim/modules/airline.vim
-"source $HOME/.config/nvim/modules/deoplete.vim
+source $HOME/.config/nvim/modules/startify.vim
+source $HOME/.config/nvim/modules/general.vim
+source $HOME/.config/nvim/modules/fzf.vim
 source $HOME/.config/nvim/modules/ranger.vim
 source $HOME/.config/nvim/modules/nerdtree.vim
-source $HOME/.config/nvim/modules/startify.vim
-source $HOME/.config/nvim/modules/gutentags_plus.vim
 source $HOME/.config/nvim/modules/markdown-preview.vim
-"source $HOME/.config/nvim/modules/ale.vim
 source $HOME/.config/nvim/modules/goyo-limelight.vim
 source $HOME/.config/nvim/modules/relativenums.vim
-"source $HOME/.config/nvim/modules/pydocstring.vim
-"source $HOME/.config/nvim/modules/neosnippets.vim
 source $HOME/.config/nvim/modules/emmet.vim
 source $HOME/.config/nvim/modules/colorizer.vim
 source $HOME/.config/nvim/modules/rainbow.vim
 source $HOME/.config/nvim/modules/vim-which-key.vim
-source $HOME/.config/nvim/modules/echodoc.vim
+source $HOME/.config/nvim/modules/echodoc.vim         " I forget what this does
+source $HOME/.config/nvim/modules/vim_wiki.vim
+
+source $HOME/.config/nvim/modules/gutentags_plus.vim " disabled until 141 error is fixed
+"source $HOME/.config/nvim/modules/ale.vim
+"source $HOME/.config/nvim/modules/pydocstring.vim
+"source $HOME/.config/nvim/modules/neosnippets.vim " I need to do my homework on snippets
diff --git a/modules/general.vim b/modules/general.vim
index c77460fa..83275709 100644
--- a/modules/general.vim
+++ b/modules/general.vim
@@ -11,7 +11,6 @@ xmap <space> \
 
 syntax enable                           " Enables syntax highlighing
 set hidden                              " Required for specific actions that require multiple buffers
-set conceallevel=0
 set nowrap                              " display long lines as just one line
 set encoding=utf-8                      " The encoding displayed 
 set pumheight=10                        " Makes popup menu smaller
@@ -24,7 +23,7 @@ set splitbelow                          " Horizontal splits will automatically b
 set splitright                          " Vertical splits will automatically be to the right
 set t_Co=256                            " Support 256 colors
 set autochdir                           " Your working directory will always be the same as your working directory
-:set conceallevel=0                     " So that I can see `` in markdown files
+set conceallevel=0                     " So that I can see `` in markdown files
 set tabstop=2                           " Insert 2 spaces for a tab
 set shiftwidth=2                        " Change the number of space characters inserted for indentation
 set smarttab                            " Makes tabbing smarter will realize you have 2 vs 4
@@ -78,11 +77,21 @@ nnoremap <M-j> <C-w>j
 nnoremap <M-k> <C-w>k
 nnoremap <M-l> <C-w>l
 
+" I think this does something on mac but I might be full of shit
 nnoremap <D-h> <C-w>h
 nnoremap <D-j> <C-w>j
 nnoremap <D-k> <C-w>k
 nnoremap <D-l> <C-w>l
 
+
+" TAB in general mode will move to text buffer
+nnoremap <C-TAB> :VimwikiNextLink<CR>
+" SHIFT-TAB will go back
+nnoremap <C-S-TAB> :VimwikiPrevLink<CR>
+
+nmap <Leader>wn <Plug>VimwikiNextLink
+nmap <Leader>wp <Plug>VimwikiPrevLink
+<
 " TAB in general mode will move to text buffer
 nnoremap <TAB> :bnext<CR>
 " SHIFT-TAB will go back
diff --git a/modules/goyo-limelight.vim b/modules/goyo-limelight.vim
index 74b6bea3..0749f108 100644
--- a/modules/goyo-limelight.vim
+++ b/modules/goyo-limelight.vim
@@ -9,7 +9,7 @@ let g:goy_height=95
 
 function! s:goyo_enter()
   
-  call deoplete#custom#option('auto_complete', v:false)
+  "call deoplete#custom#option('auto_complete', v:false)
   set spell spelllang=en_us
   set wrap
   set conceallevel=0
@@ -18,23 +18,46 @@ function! s:goyo_enter()
   set scrolloff=999
 ""  set background=light
 ""  colorscheme flattened_light
-  Limelight
+  "Limelight
   " ...
 endfunction
 
 function! s:goyo_leave()
 
-  call deoplete#custom#option('auto_complete', v:true)
+  "call deoplete#custom#option('auto_complete', v:true)
   set nospell
   set wrap!
   set showcmd
   set scrolloff=5
 ""  set background=dark
 ""  colorscheme Tender
-  Limelight!
+  "Limelight!
   " ...
 endfunction
 
 autocmd! User GoyoEnter nested call <SID>goyo_enter()
 autocmd! User GoyoLeave nested call <SID>goyo_leave()
 
+" Color name (:help cterm-colors) or ANSI code
+let g:limelight_conceal_ctermfg = 'gray'
+let g:limelight_conceal_ctermfg = 240
+
+" Color name (:help gui-colors) or RGB color
+let g:limelight_conceal_guifg = 'DarkGray'
+let g:limelight_conceal_guifg = '#777777'
+
+" Default: 0.5
+let g:limelight_default_coefficient = 0.7
+
+" Number of preceding/following paragraphs to include (default: 0)
+let g:limelight_paragraph_span = 0
+
+" Beginning/end of paragraph
+"   When there's no empty line between the paragraphs
+"   and each paragraph starts with indentation
+let g:limelight_bop = '^\s'
+let g:limelight_eop = '\ze\n^\s'
+
+" Highlighting priority (default: 10)
+"   Set it to -1 not to overrule hlsearch
+let g:limelight_priority = -1
diff --git a/modules/gutentags_plus.vim b/modules/gutentags_plus.vim
index 2e6b185e..370cf7f6 100644
--- a/modules/gutentags_plus.vim
+++ b/modules/gutentags_plus.vim
@@ -16,3 +16,9 @@ let g:gutentags_file_list_command = 'rg --files'
 "Install ripgrep"
 "Install ctags"
 ".notags will ignore everything"
+
+" I think this is built in but it's nice to know that if yo
+" have ripgrep ctags will ignore everyhting in your .gitignore
+if executable('rg')
+  let g:gutentags_file_list_command = 'rg --files'
+endif
diff --git a/modules/nerdtree.vim b/modules/nerdtree.vim
index e445a189..973ac264 100644
--- a/modules/nerdtree.vim
+++ b/modules/nerdtree.vim
@@ -23,3 +23,8 @@ let g:NERDTreePatternMatchHighlightFullName = 1
 
 let g:NERDTreeHighlightFolders = 1 " enables folder icon highlighting using exact match
 let g:NERDTreeHighlightFoldersFullName = 1 " highlights the folder name
+" Original coloring
+highlight! link NERDTreeFlags NERDTreeDir
+" Get rid of help thing at the top
+"let NERDTreeMinimalUI=1
+
diff --git a/modules/plugins.vim b/modules/plugins.vim
index 80388657..d1a52d80 100644
--- a/modules/plugins.vim
+++ b/modules/plugins.vim
@@ -27,16 +27,18 @@ if dein#load_state('~/.config/nvim/dein')
   call dein#add('janko-m/vim-test')
   " Better Syntax Support
   call dein#add('sheerun/vim-polyglot')
-  " powerline
+  " Powerline
   call dein#add('vim-airline/vim-airline')
   call dein#add('vim-airline/vim-airline-themes')
-  " File manager
+  " File explorer
   call dein#add('scrooloose/NERDTree')
   " Comments "
   call dein#add('scrooloose/nerdcommenter')
   " Icons
   call dein#add('ryanoasis/vim-devicons')
   call dein#add('tiagofumo/vim-nerdtree-syntax-highlight')
+  " Git support
+  call dein#add('Xuyuanp/nerdtree-git-plugin')
   " Start Screen
   call dein#add('mhinz/vim-startify')
   " For ctags
@@ -72,6 +74,8 @@ if dein#load_state('~/.config/nvim/dein')
   call dein#add('Shougo/neosnippet.vim')
   call dein#add('Shougo/neosnippet-snippets')
   call dein#add('mattn/emmet-vim')
+  " Vim Wiki
+  call dein#add('vimwiki/vimwiki')
   "echo doc 
   call dein#add('Shougo/echodoc.vim')
   "Colorizer "
diff --git a/modules/startify.vim b/modules/startify.vim
index 8cdaf8b8..6f12ecc4 100644
--- a/modules/startify.vim
+++ b/modules/startify.vim
@@ -1,16 +1,16 @@
 
-let g:startify_custom_header = [
-\ '  __    _________                            __    ____   ____.__          ',
-\ ' / /   /   _____/__________    ____  ____    \ \   \   \ /   /|__| _____   ',
-\ '/ /    \_____  \\____ \__  \ _/ ___\/ __ \    \ \   \   Y   / |  |/     \  ',
-\ '\ \    /        \  |_> > __ \\  \__\  ___/    / /    \     /  |  |  Y Y  \ ',
-\ ' \_\  /_______  /   __(____  /\___  >___  >  /_/      \___/   |__|__|_|  / ',
-\ '              \/|__|       \/     \/    \/                             \/  ']
+"let g:startify_custom_header = [
+"\ '  __    _________                            __    ____   ____.__          ',
+"\ ' / /   /   _____/__________    ____  ____    \ \   \   \ /   /|__| _____   ',
+"\ '/ /    \_____  \\____ \__  \ _/ ___\/ __ \    \ \   \   Y   / |  |/     \  ',
+"\ '\ \    /        \  |_> > __ \\  \__\  ___/    / /    \     /  |  |  Y Y  \ ',
+"\ ' \_\  /_______  /   __(____  /\___  >___  >  /_/      \___/   |__|__|_|  / ',
+"\ '              \/|__|       \/     \/    \/                             \/  ']
 
 
-"let g:startify_custom_header = [                                                                                                                                                                                 
-  "\ '     _   __                _         ',
-  "\ '    / | / /__  ____ _   __(_)___ ___ ',
-  "\ '   /  |/ / _ \/ __ \ | / / / __ `__ \',
-  "\ '  / /|  /  __/ /_/ / |/ / / / / / / /',
-  "\ ' /_/ |_/\___/\____/|___/_/_/ /_/ /_/ ']
+let g:startify_custom_header = [                                                                                                                                                                                 
+  \ '     _   __                _         ',
+  \ '    / | / /__  ____ _   __(_)___ ___ ',
+  \ '   /  |/ / _ \/ __ \ | / / / __ `__ \',
+  \ '  / /|  /  __/ /_/ / |/ / / / / / / /',
+  \ ' /_/ |_/\___/\____/|___/_/_/ /_/ /_/ ']
diff --git a/modules/vim-which-key.vim b/modules/vim-which-key.vim
index 7388e02b..3b24273f 100644
--- a/modules/vim-which-key.vim
+++ b/modules/vim-which-key.vim
@@ -29,14 +29,18 @@ nnoremap <silent> <leader>in :call OpenConfigFile('~/.config/nvim/init.vim')<cr>
 nnoremap <silent> <leader>bashrc :call OpenConfigFile('~/.bashrc')<cr>
 nnoremap <silent> <leader>code :call OpenConfigFile('~/Library/Application Support/Code/User/settings.json')<cr>
 
-let g:which_key_map['/'] = [ '<Plug>NERDCommenterToggle','commenter' ]
+let g:which_key_map['/'] = [ '<Plug>NERDCommenterToggle', 'commenter' ]
 let g:which_key_map['e'] = [ 'NERDTreeToggle', 'file-explorer' ]           
-let g:which_key_map['p'] = [ 'pclose','close-preview' ]
-let g:which_key_map['q'] = [ 'q','quit' ]
-let g:which_key_map['d'] = [ 'bd','delete-buffer' ]
-let g:which_key_map['s'] = [ 'w','save' ]
-let g:which_key_map['r'] = [ 'Ranger','ranger' ]
-let g:which_key_map['f'] = [ 'FZF','fzf' ]
+let g:which_key_map['p'] = [ 'pclose'    , 'close-preview' ]
+let g:which_key_map['q'] = [ 'q'         , 'quit' ]
+let g:which_key_map['d'] = [ 'bd'        , 'delete-buffer' ]
+let g:which_key_map['s'] = [ 'w'         , 'save' ]
+let g:which_key_map['r'] = [ 'Ranger'    , 'ranger' ]
+let g:which_key_map['f'] = [ 'FZF'       , 'fzf' ]
+let g:which_key_map['z'] = [ 'Goyo'      , 'zen-mode' ]
+let g:which_key_map['v'] = ['<C-W>v'     , 'split-window-right']
+let g:which_key_map['h'] = ['<C-W>s'     , 'split-window-below']
+let g:which_key_map['o'] = ['only'       , 'close-all-other-windows']
 
 let g:which_key_map.t = {
       \ 'name' : '+toggle' ,
@@ -79,17 +83,17 @@ let g:which_key_map.l = {
         \ },
       \ }
 
-let g:which_key_map.w = {
-      \ 'name' : '+windows' ,
-      \ 'v' : ['<C-W>v'     , 'split-window-right']    ,
-      \ 'h' : ['<C-W>s'     , 'split-window-below']    ,
-      \ 'w' : ['<C-W>w'     , 'other-window']          ,
-      \ 'o' : ['only'       , 'close-all-other-windows']    ,
-      \ 'd' : ['<C-W>c'     , 'delete-window']         ,
-      \ '2' : ['<C-W>v'     , 'layout-double-columns'] ,
-      \ '=' : ['<C-W>='     , 'balance-window']        ,
-      \ '?' : ['Windows'    , 'fzf-window']            ,
-      \ }
+"let g:which_key_map.w = {
+      "\ 'name' : '+windows' ,
+      "\ 'v' : ['<C-W>v'     , 'split-window-right']    ,
+      "\ 'h' : ['<C-W>s'     , 'split-window-below']    ,
+      "\ 'w' : ['<C-W>w'     , 'other-window']          ,
+      "\ 'o' : ['only'       , 'close-all-other-windows']    ,
+      "\ 'd' : ['<C-W>c'     , 'delete-window']         ,
+      "\ '2' : ['<C-W>v'     , 'layout-double-columns'] ,
+      "\ '=' : ['<C-W>='     , 'balance-window']        ,
+      "\ '?' : ['Windows'    , 'fzf-window']            ,
+      "\ }
 
 let g:which_key_map.b = {
        \ 'name' : '+buffer' ,
diff --git a/modules/vim_wiki.vim b/modules/vim_wiki.vim
new file mode 100644
index 00000000..4bce4f0e
--- /dev/null
+++ b/modules/vim_wiki.vim
@@ -0,0 +1,32 @@
+let g:vimwiki_list = [{'path': '~/wiki/',
+                      \ 'syntax': 'markdown', 'ext': '.md'}]
+
+" TAB in general mode will move to text buffer
+nnoremap <TAB> :bnext<CR>
+" SHIFT-TAB will go back
+nnoremap <S-TAB> :bprevious<CR>
+
+
+
+"let g:vimwiki_list = [{'path': '~/wiki/', 'index': 'main'}]
+"Key bindings
+"Normal mode:
+
+"<Leader>ww -- Open default wiki index file.
+"<Leader>wt -- Open default wiki index file in a new tab.
+"<Leader>ws -- Select and open wiki index file.
+"<Leader>wd -- Delete wiki file you are in.
+"<Leader>wr -- Rename wiki file you are in.
+"<Enter> -- Follow/Create wiki link
+"<Shift-Enter> -- Split and follow/create wiki link
+"<Ctrl-Enter> -- Vertical split and follow/create wiki link
+"<Backspace> -- Go back to parent(previous) wiki link
+"<Tab> -- Find next wiki link
+"<Shift-Tab> -- Find previous wiki link
+"For more keys, see :h vimwiki-mappings
+
+"Commands
+":Vimwiki2HTML -- Convert current wiki link to HTML
+":VimwikiAll2HTML -- Convert all your wiki links to HTML
+":help vimwiki-commands -- list all commands
+":help vimwiki -- General vimwiki help docs
diff --git a/utils/installer.sh b/utils/installer.sh
index de8c093e..440a1de6 100644
--- a/utils/installer.sh
+++ b/utils/installer.sh
@@ -37,49 +37,6 @@ if ! [ -e "$INSTALL_DIR" ]; then
   echo ""
 fi
 
-# write initial setting for .vimrc
-echo "Please add the following settings for dein to the top of your vimrc (Vim) or init.vim (NeoVim) file:"
-{
-    echo ""
-    echo ""
-    echo "\"dein Scripts-----------------------------"
-    echo "if &compatible"
-    echo "  set nocompatible               \" Be iMproved"
-    echo "endif"
-    echo ""
-    echo "\" Required:"
-    echo "set runtimepath+=$INSTALL_DIR"
-    echo ""
-    echo "\" Required:"
-    echo "if dein#load_state('$PLUGIN_DIR')"
-    echo "  call dein#begin('$PLUGIN_DIR')"
-    echo ""
-    echo "  \" Let dein manage dein"
-    echo "  \" Required:"
-    echo "  call dein#add('$INSTALL_DIR')"
-    echo ""
-    echo "  \" Add or remove your plugins here like this:"
-    echo "  \"call dein#add('Shougo/neosnippet.vim')"
-    echo "  \"call dein#add('Shougo/neosnippet-snippets')"
-    echo ""
-    echo "  \" Required:"
-    echo "  call dein#end()"
-    echo "  call dein#save_state()"
-    echo "endif"
-    echo ""
-    echo "\" Required:"
-    echo "filetype plugin indent on"
-    echo "syntax enable"
-    echo ""
-    echo "\" If you want to install not installed plugins on startup."
-    echo "\"if dein#check_install()"
-    echo "\"  call dein#install()"
-    echo "\"endif"
-    echo ""
-    echo "\"End dein Scripts-------------------------"
-    echo ""
-    echo ""
-}
 
 echo "Done."