big updates

8 files changed, 176 insertions, 32 deletions

diff --git a/README.md b/README.md
index 651add00..90032db5 100644
--- a/README.md
+++ b/README.md
@@ -25,17 +25,6 @@ Follow my development here
 ```
 conda create -n neovim python=3.7
 
-npm i -g neovim
-
-pip install 'python-language-server[all]'
-
-pip uninstall pycodestye
-
-pip install vim-vint
-
-npm i -g bash-language-server
-
-npm install -g javascript-typescript-langserver
 ```
 
 install ripgrep" for gutentags to ignore .gitignore
@@ -46,13 +35,16 @@ make sure you open the language server module and point to the correct binaries
 
 ## TODO 
 
-start using coc
-
-install this stuff
-
-https://github.com/kevinhwang91/rnvimr
-VimWiki
-coc
-Plug 'numirias/semshi', {'do': ':UpdateRemotePlugins'}
-https://github.com/voldikss/coc-todolist
+### Install this stuff
+- Document node nonsense in order to install coc
+- configure coc settings better 
+- need formatter for other languages
+- Java support
+- Need support for image in current ranger implementation
+- https://github.com/kevinhwang91/rnvimr (Note Ueberzug doesn't work on mac which sucks, also neither does this plugin)
+- Check out more coc extensions
+- https://github.com/voldikss/coc-todolist
+- VimWiki
+- fix tmux messing up my colors
+- figure out denite and give it a good shortcut
 
diff --git a/coc-settings.json b/coc-settings.json
new file mode 100644
index 00000000..9c75a4b1
--- /dev/null
+++ b/coc-settings.json
@@ -0,0 +1,3 @@
+{
+  "coc.preferences.formatOnSaveFiletypes": ["css", "markdown", "javascript"]
+}
diff --git a/init.vim b/init.vim
index e6df8194..754035cc 100644
--- a/init.vim
+++ b/init.vim
@@ -1,27 +1,26 @@
 " Activate Modules
-set shell=bash
-source $HOME/.config/nvim/modules/pythonpath.vim
+source $HOME/.config/nvim/modules/pythonpath.vim " Eventually move to pyenv/virtualenv
+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/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/deoplete.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/language_server.vim
-source $HOME/.config/nvim/modules/ale.vim
+"source $HOME/.config/nvim/modules/language_server.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/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
 " Special test file "
 source $HOME/.config/nvim/modules/test.vim
-
diff --git a/install/install.sh b/install/install.sh
index 759e9da0..ba272c8d 100755
--- a/install/install.sh
+++ b/install/install.sh
@@ -7,6 +7,7 @@ if [ "$(uname)" == "Darwin" ]; then
     echo " Grabbing a font to use foe devicons "
     brew tap homebrew/cask-fonts
     brew cask install font-hack-nerd-font
+    brew install ranger
 elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then
     echo 'Linux Detected'
     wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O ~/.config/nvim/install/miniconda.sh
diff --git a/modules/coc.vim b/modules/coc.vim
new file mode 100644
index 00000000..855127a0
--- /dev/null
+++ b/modules/coc.vim
@@ -0,0 +1,144 @@
+" TextEdit might fail if hidden is not set.
+set hidden
+
+" Some servers have issues with backup files, see #649.
+set nobackup
+set nowritebackup
+
+" Give more space for displaying messages.
+set cmdheight=2
+
+" Having longer updatetime (default is 4000 ms = 4 s) leads to noticeable
+" delays and poor user experience.
+set updatetime=300
+
+" Don't pass messages to |ins-completion-menu|.
+set shortmess+=c
+
+" Always show the signcolumn, otherwise it would shift the text each time
+" diagnostics appear/become resolved.
+set signcolumn=yes
+
+"better nav for omnicomplete
+inoremap <expr> <c-j> ("\<C-n>")
+inoremap <expr> <c-k> ("\<C-p>")
+
+" Use tab for trigger completion with characters ahead and navigate.
+" NOTE: Use command ':verbose imap <tab>' to make sure tab is not mapped by
+" other plugin before putting this into your config.
+inoremap <silent><expr> <TAB>
+      \ pumvisible() ? "\<C-n>" :
+      \ <SID>check_back_space() ? "\<TAB>" :
+      \ coc#refresh()
+inoremap <expr><S-TAB> pumvisible() ? "\<C-p>" : "\<C-h>"
+
+function! s:check_back_space() abort
+  let col = col('.') - 1
+  return !col || getline('.')[col - 1]  =~# '\s'
+endfunction
+
+" Use <c-space> to trigger completion.
+inoremap <silent><expr> <c-space> coc#refresh()
+
+" Use <cr> to confirm completion, `<C-g>u` means break undo chain at current
+" position. Coc only does snippet and additional edit on confirm.
+if has('patch8.1.1068')
+  " Use `complete_info` if your (Neo)Vim version supports it.
+  inoremap <expr> <cr> complete_info()["selected"] != "-1" ? "\<C-y>" : "\<C-g>u\<CR>"
+else
+  imap <expr> <cr> pumvisible() ? "\<C-y>" : "\<C-g>u\<CR>"
+endif
+
+" Use `[g` and `]g` to navigate diagnostics
+nmap <silent> [g <Plug>(coc-diagnostic-prev)
+nmap <silent> ]g <Plug>(coc-diagnostic-next)
+
+" GoTo code navigation.
+nmap <silent> gd <Plug>(coc-definition)
+nmap <silent> gy <Plug>(coc-type-definition)
+nmap <silent> gi <Plug>(coc-implementation)
+nmap <silent> gr <Plug>(coc-references)
+
+" Use K to show documentation in preview window.
+nnoremap <silent> K :call <SID>show_documentation()<CR>
+
+function! s:show_documentation()
+  if (index(['vim','help'], &filetype) >= 0)
+    execute 'h '.expand('<cword>')
+  else
+    call CocAction('doHover')
+  endif
+endfunction
+
+" Highlight the symbol and its references when holding the cursor.
+autocmd CursorHold * silent call CocActionAsync('highlight')
+
+" Symbol renaming.
+nmap <leader>rn <Plug>(coc-rename)
+
+" Formatting selected code.
+xmap <leader>f  <Plug>(coc-format-selected)
+nmap <leader>f  <Plug>(coc-format-selected)
+
+augroup mygroup
+  autocmd!
+  " Setup formatexpr specified filetype(s).
+  autocmd FileType typescript,json setl formatexpr=CocAction('formatSelected')
+  " Update signature help on jump placeholder.
+  autocmd User CocJumpPlaceholder call CocActionAsync('showSignatureHelp')
+augroup end
+
+" Applying codeAction to the selected region.
+" Example: `<leader>aap` for current paragraph
+xmap <leader>a  <Plug>(coc-codeaction-selected)
+nmap <leader>a  <Plug>(coc-codeaction-selected)
+
+" Remap keys for applying codeAction to the current line.
+nmap <leader>ac  <Plug>(coc-codeaction)
+" Apply AutoFix to problem on the current line.
+nmap <leader>qf  <Plug>(coc-fix-current)
+
+" Introduce function text object
+" NOTE: Requires 'textDocument.documentSymbol' support from the language server.
+xmap if <Plug>(coc-funcobj-i)
+xmap af <Plug>(coc-funcobj-a)
+omap if <Plug>(coc-funcobj-i)
+omap af <Plug>(coc-funcobj-a)
+
+" Use <TAB> for selections ranges.
+" NOTE: Requires 'textDocument/selectionRange' support from the language server.
+" coc-tsserver, coc-python are the examples of servers that support it.
+nmap <silent> <TAB> <Plug>(coc-range-select)
+xmap <silent> <TAB> <Plug>(coc-range-select)
+
+" Add `:Format` command to format current buffer.
+command! -nargs=0 Format :call CocAction('format')
+
+" Add `:Fold` command to fold current buffer.
+command! -nargs=? Fold :call     CocAction('fold', <f-args>)
+
+" Add `:OR` command for organize imports of the current buffer.
+command! -nargs=0 OR   :call     CocAction('runCommand', 'editor.action.organizeImport')
+
+" Add (Neo)Vim's native statusline support.
+" NOTE: Please see `:h coc-status` for integrations with external plugins that
+" provide custom statusline: lightline.vim, vim-airline.
+set statusline^=%{coc#status()}%{get(b:,'coc_current_function','')}
+
+" Mappings using CoCList:
+" Show all diagnostics.
+nnoremap <silent> <space>a  :<C-u>CocList diagnostics<cr>
+" Manage extensions.
+nnoremap <silent> <space>e  :<C-u>CocList extensions<cr>
+" Show commands.
+nnoremap <silent> <space>c  :<C-u>CocList commands<cr>
+" Find symbol of current document.
+nnoremap <silent> <space>o  :<C-u>CocList outline<cr>
+" Search workspace symbols.
+nnoremap <silent> <space>s  :<C-u>CocList -I symbols<cr>
+" Do default action for next item.
+nnoremap <silent> <space>j  :<C-u>CocNext<CR>
+" Do default action for previous item.
+nnoremap <silent> <space>k  :<C-u>CocPrev<CR>
+" Resume latest coc list.
+nnoremap <silent> <space>p  :<C-u>CocListResume<CR>
diff --git a/modules/nodepath.vim b/modules/nodepath.vim
new file mode 100644
index 00000000..20d6c33d
--- /dev/null
+++ b/modules/nodepath.vim
@@ -0,0 +1,2 @@
+" You can comment this and recomment it after installing coc executable('~/.nvm/versions/node/v12.16.1/bin/node')
+let g:coc_node_path = expand("~/.nvm/versions/node/v12.16.1/bin/node")
diff --git a/modules/plugins.vim b/modules/plugins.vim
index 47117172..2538b601 100644
--- a/modules/plugins.vim
+++ b/modules/plugins.vim
@@ -12,6 +12,8 @@ if dein#load_state('~/.config/nvim/dein')
   "call dein#add('kevinhwang91/rnvimr', {'do': 'make sync'})
   call dein#add('francoiscabrol/ranger.vim')
   call dein#add('rbgrouleff/bclose.vim')
+  " Language support
+  call dein#add('neoclide/coc.nvim', {'merged':0, 'rev': 'release'})
   " All the Themes
   call dein#add('joshdick/onedark.vim')
   " key menu popup "
@@ -48,7 +50,7 @@ if dein#load_state('~/.config/nvim/dein')
   " Buffergator use \b
 ""  call dein#add('jeetsukumaran/vim-buffergator')
   " Ctrlp 
-  call dein#add('ctrlpvim/ctrlp.vim')
+  "call dein#add('ctrlpvim/ctrlp.vim')
   "Linting 
   call dein#add('w0rp/ale') 
   call dein#add('autozimu/LanguageClient-neovim', {
@@ -56,8 +58,8 @@ if dein#load_state('~/.config/nvim/dein')
     \ 'build': 'bash install.sh',
     \ })
   " Fuzzy finder
-  call dein#add('junegunn/fzf.vim',  { 'dir': '~/.fzf', 'do': './install --all' })
-  call dein#add('junegunn/fzf')
+  "call dein#add('junegunn/fzf.vim',  { 'dir': '~/.fzf', 'do': './install --all' })
+  "call dein#add('junegunn/fzf')
   " Sneak mode "
   call dein#add('justinmk/vim-sneak')
   ""Git
diff --git a/modules/vim-which-key.vim b/modules/vim-which-key.vim
index 1931a42e..2e791a06 100644
--- a/modules/vim-which-key.vim
+++ b/modules/vim-which-key.vim
@@ -32,6 +32,7 @@ nnoremap <silent> <leader>code :call OpenConfigFile('~/Library/Application Suppo
 let g:which_key_map['/'] = [ '<Plug>NERDCommenterToggle','commenter' ]
 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['f'] = [ 'Denite file','files' ]
 let g:which_key_map['f'] = [ 'Ranger','Ranger' ]