initial merge

.vimrc

@@ -81,11 +81,17 @@ if exists('veonim')
 " set linespace=10
 endif
 
+if exists('gnvim')
+  set guifont=Droid\ Sans\ Mono\ Dotted:h15
+endif
+
 " Required:
 set runtimepath+=/home/barak/.vim/bundle/repos/github.com/Shougo/dein.vim
 
 " Required:
 call plug#begin('/home/barak/.vim/bundle')
+" Aw, fuck, I can't believe you've done this.
+
 
 " Plugins that must be first
 Plug '/home/barak/.vim/bundle/repos/github.com/Shougo/dein.vim'
@@ -116,10 +122,9 @@ Plug 'bps/vim-textobj-python'
 
 " Plugins I NEED
 Plug 'scrooloose/nerdcommenter'
-Plug 'sjbach/lusty'
+"Plug 'sjbach/lusty'
 "Plug 'w0rp/ale'
-"Plug 'airblade/vim-gitgutter'
-Plug 'mhinz/vim-signify'
+Plug 'airblade/vim-gitgutter'
 Plug 'vim-airline/vim-airline'
 Plug 'vim-airline/vim-airline-themes'
 Plug 'junegunn/fzf'
@@ -175,7 +180,11 @@ Plug 'hwayne/tla.vim'
     "\ 'do': 'bash install.sh',
     "\ }
 "Plug 'ensime/ensime-vim', { 'do': ':UpdateRemotePlugins' }
-Plug 'neoclide/coc.nvim', {'tag': '*', 'do': './install.sh'}
+Plug 'neoclide/coc.nvim', {'branch': 'release'}
+"Plug 'prabirshrestha/async.vim'
+"Plug 'prabirshrestha/vim-lsp'
+"Plug 'prabirshrestha/asyncomplete.vim'
+"Plug 'prabirshrestha/asyncomplete-lsp.vim'
 
 " Plugins that do specific things
 Plug 'Shougo/vimproc.vim'
@@ -225,6 +234,7 @@ autocmd InsertLeave * if pumvisible() == 0|pclose|endif
 "source ~/.vim/supertab.vim
 "source ~/.vim/charm.vim
 "source ~/.vim/plugin/AppleT.vim
+source ~/.vim/vim-lsp-conf.vim
 runtime macros/matchit.vim
 
 " Completion features (TODO: Add to filetype.vim)
@@ -463,6 +473,7 @@ let g:go_updatetime = 300
 let g:go_bin_path = $HOME . "/.go/bin"
 "let g:go_def_mode = 'gopls'
 "let g:go_info_mode = 'gopls'
+let g:go_def_mode = 'guru'
 
 " ** STATUSLINE **
 set laststatus=2
@@ -678,7 +689,8 @@ nnoremap gK :bdelete!<CR>
 " I use gn/gp to cycle through open tabs/buffers
 nnoremap gn :bn<CR>
 nnoremap gp :bp<CR>
-nnoremap gz :pclose<CR>
+"nnoremap gz :pclose<CR>
+nnoremap gz :!zeal "<cword>"&<CR><CR>
 " The single most handy way to get around a file. Cursor over a word, and then
 " type g* -- you'll go to the next instance of that word in the file. Make it
 " easier to reach by calling it gw (go-word) instead of hidden away.
@@ -751,8 +763,8 @@ nnoremap <Leader>fn :lnext<CR>
 " Prev quickfix.
 nnoremap <Leader>fp :lprev<CR>
 "nnoremap <silent> <Leader>aa :<C-u>Denite -mode=normal -buffer-name=search-buffer grep<CR>
-nnoremap <silent> <Leader>ac :<C-u>Denite -resume -mode=normal -buffer-name=search-buffer<CR>
-nnoremap <silent> <Leader>aw :<C-u>DeniteCursorWord -mode=normal -buffer-name=search-buffer grep<CR>
+nnoremap <silent> <Leader>ac :<C-u>Denite -resume -buffer-name=search-buffer<CR>
+nnoremap <silent> <Leader>aw :<C-u>DeniteCursorWord -buffer-name=search-buffer grep<CR>
 call denite#custom#map('insert', '<Enter>', '<C-o>')
 call denite#custom#var('grep', 'command', ['pt'])
 call denite#custom#var('grep', 'default_opts',
@@ -762,10 +774,26 @@ call denite#custom#var('grep', 'pattern_opt', [])
 call denite#custom#var('grep', 'separator', ['--'])
 call denite#custom#var('grep', 'final_opts', [])
 call denite#custom#option('search-buffer', 'highlight_matched_char', 'deniteMatchedChar')
-nnoremap <silent> <Leader>g :<C-u>Denite -buffer-name=search-buffer grep<CR>
-nnoremap <silent> <Leader>aa :<C-u>RipGrep!<CR>
-nnoremap <C-l> :<C-u>Files! `git rev-parse --show-toplevel`<CR>
-nnoremap <C-k> :<C-u>Buffers<CR>
+"nnoremap <silent> <Leader>aa :<C-u>RipGrep!<CR>
+autocmd FileType denite call s:denite_my_settings()
+function! s:denite_my_settings() abort
+  nnoremap <silent><buffer><expr> <CR>
+  \ denite#do_map('do_action')
+  nnoremap <silent><buffer><expr> d
+  \ denite#do_map('do_action', 'delete')
+  nnoremap <silent><buffer><expr> p
+  \ denite#do_map('do_action', 'preview')
+  nnoremap <silent><buffer><expr> q
+  \ denite#do_map('quit')
+  nnoremap <silent><buffer><expr> i
+  \ denite#do_map('open_filter_buffer')
+  nnoremap <silent><buffer><expr> <Space>
+  \ denite#do_map('toggle_select').'j'
+endfunction
+nnoremap <silent> <Leader>aa :<C-u>Denite -buffer-name=search-buffer grep<CR>
+"nnoremap <silent> <Leader>aa :<C-u>RipGrep!<CR>
+nnoremap <C-k> :<C-u>Files! `git rev-parse --show-toplevel`<CR>
+" nnoremap <C-k> :<C-u>Buffers<CR>
 " For C++ -- A is a great plugin which allows you to jump from the c file to the
 " header and vice-versa. Mneumonic here is headerheader.
 nnoremap <Leader>hh :A<CR>
@@ -776,6 +804,7 @@ nnoremap <silent> <Leader>o :CtrlPBuffer<CR>
 "nnoremap <Leader>p  :PTW 
 nnoremap <Leader>p  :LustyJugglePrevious<CR>
 nnoremap <Leader>jd :YcmCompleter GoToDefinitionElseDeclaration<CR>
+nnoremap <Leader>mm :w<CR>:make!<CR>
 
 " ** EXTRA INCLUDES **
 "
@@ -787,7 +816,7 @@ endif
 " ** SEE ALSO **
 " filetype.vim
 
-command Comments lexpr system('/home/barak/src/gogh/src/github.com/barakmich/gogh/gogh')
+command Comments lexpr system('/home/bmichener/src/gogh/src/github.com/barakmich/gogh/gogh')
 
 
 "call remote#host#RegisterPlugin('python3', '/home/barak/.vim/bundle/deoplete.nvim/rplugin/python3/deoplete', [