clean up vim plugins and colors

.gitignore

@@ -2,6 +2,7 @@
 nvim.configlink/dirs/*
 nvim.configlink/.netrwhist
 nvim.configlink/plugged/**
+nvim.configlink/autoload/**
 spacemacs.d.symlink/.spacemacs.env
 fish.configlink/config.fish.bac
 *.lock.json

homebrew/Brewfile

@@ -26,6 +26,7 @@ brew "pyenv-virtualenv"     # Python virtualenvs
 brew "ruby"                 # Newer than default ruby
 brew "ansible"              # Deploy to local server
 brew "terraform"            # Deploy cloud infra
+brew "node"                 # Ugh, nodejs
 brew "packer"               # Build deployment images
 brew "gpg"                  # Encryption
 brew "qrencode"             # Make a QR code

nvim.configlink/autoload/airline/themes/gruvbox.vim

@@ -1,79 +0,0 @@
-" -----------------------------------------------------------------------------
-" File: gruvbox.vim
-" Description: Retro groove color scheme for Airline
-" Author: morhetz <morhetz@gmail.com>
-" Source: https://github.com/morhetz/gruvbox
-" Last Modified: 12 Aug 2017
-" -----------------------------------------------------------------------------
-
-let g:airline#themes#gruvbox#palette = {}
-
-function! airline#themes#gruvbox#refresh()
-
-  let M0 = airline#themes#get_highlight('Identifier')
-  let accents_group = airline#themes#get_highlight('Special')
-  let modified_group = [M0[0], '', M0[2], '', '']
-  let warning_group = airline#themes#get_highlight2(['Normal', 'bg'], ['Question', 'fg'])
-  let error_group = airline#themes#get_highlight2(['Normal', 'bg'], ['WarningMsg', 'fg'])
-
-  let s:N1 = airline#themes#get_highlight2(['Normal', 'bg'], ['StatusLineNC', 'bg'])
-  let s:N2 = airline#themes#get_highlight2(['StatusLineNC', 'bg'], ['Pmenu', 'bg'])
-  let s:N3 = airline#themes#get_highlight2(['StatusLineNC', 'bg'], ['CursorLine', 'bg'])
-  let g:airline#themes#gruvbox#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
-  let g:airline#themes#gruvbox#palette.normal_modified = { 'airline_c': modified_group }
-  let g:airline#themes#gruvbox#palette.normal.airline_warning = warning_group
-  let g:airline#themes#gruvbox#palette.normal_modified.airline_warning = warning_group
-  let g:airline#themes#gruvbox#palette.normal.airline_error = error_group
-  let g:airline#themes#gruvbox#palette.normal_modified.airline_error = error_group
-
-  let s:I1 = airline#themes#get_highlight2(['Normal', 'bg'], ['Identifier', 'fg'])
-  let s:I2 = s:N2
-  let s:I3 = airline#themes#get_highlight2(['Normal', 'fg'], ['Pmenu', 'bg'])
-  let g:airline#themes#gruvbox#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
-  let g:airline#themes#gruvbox#palette.insert_modified = g:airline#themes#gruvbox#palette.normal_modified
-  let g:airline#themes#gruvbox#palette.insert.airline_warning = g:airline#themes#gruvbox#palette.normal.airline_warning
-  let g:airline#themes#gruvbox#palette.insert_modified.airline_warning = g:airline#themes#gruvbox#palette.normal_modified.airline_warning
-  let g:airline#themes#gruvbox#palette.insert.airline_error = g:airline#themes#gruvbox#palette.normal.airline_error
-  let g:airline#themes#gruvbox#palette.insert_modified.airline_error = g:airline#themes#gruvbox#palette.normal_modified.airline_error
-
-  let s:R1 = airline#themes#get_highlight2(['Normal', 'bg'], ['Structure', 'fg'])
-  let s:R2 = s:I2
-  let s:R3 = s:I3
-  let g:airline#themes#gruvbox#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
-  let g:airline#themes#gruvbox#palette.replace_modified = g:airline#themes#gruvbox#palette.normal_modified
-  let g:airline#themes#gruvbox#palette.replace.airline_warning = g:airline#themes#gruvbox#palette.normal.airline_warning
-  let g:airline#themes#gruvbox#palette.replace_modified.airline_warning = g:airline#themes#gruvbox#palette.normal_modified.airline_warning
-  let g:airline#themes#gruvbox#palette.replace.airline_error = g:airline#themes#gruvbox#palette.normal.airline_error
-  let g:airline#themes#gruvbox#palette.replace_modified.airline_error = g:airline#themes#gruvbox#palette.normal_modified.airline_error
-
-  let s:V1 = airline#themes#get_highlight2(['Normal', 'bg'], ['Question', 'fg'])
-  let s:V2 = s:N2
-  let s:V3 = airline#themes#get_highlight2(['Normal', 'bg'], ['TabLine', 'fg'])
-  let g:airline#themes#gruvbox#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
-  let g:airline#themes#gruvbox#palette.visual_modified = { 'airline_c': [ s:V3[0], '', s:V3[2], '', '' ] }
-  let g:airline#themes#gruvbox#palette.visual.airline_warning = g:airline#themes#gruvbox#palette.normal.airline_warning
-  let g:airline#themes#gruvbox#palette.visual_modified.airline_warning = g:airline#themes#gruvbox#palette.normal_modified.airline_warning
-  let g:airline#themes#gruvbox#palette.visual.airline_error = g:airline#themes#gruvbox#palette.normal.airline_error
-  let g:airline#themes#gruvbox#palette.visual_modified.airline_error = g:airline#themes#gruvbox#palette.normal_modified.airline_error
-
-  let s:IA = airline#themes#get_highlight2(['TabLine', 'fg'], ['CursorLine', 'bg'])
-  let g:airline#themes#gruvbox#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
-  let g:airline#themes#gruvbox#palette.inactive_modified = { 'airline_c': modified_group }
-
-  let g:airline#themes#gruvbox#palette.accents = { 'red': accents_group }
-
-  let s:TF = airline#themes#get_highlight2(['Normal', 'bg'], ['Normal', 'bg'])
-  let g:airline#themes#gruvbox#palette.tabline = {
-    \ 'airline_tab':  s:N2,
-    \ 'airline_tabsel':  s:N1,
-    \ 'airline_tabtype':  s:V1,
-    \ 'airline_tabfill':  s:TF,
-    \ 'airline_tabhid':  s:IA,
-    \ 'airline_tabmod':  s:I1
-    \ }
-
-endfunction
-
-call airline#themes#gruvbox#refresh()
-
-" vim: set sw=2 ts=2 sts=2 et tw=80 ft=vim fdm=marker:

nvim.configlink/autoload/gruvbox.vim

@@ -1,41 +0,0 @@
-" -----------------------------------------------------------------------------
-" File: gruvbox.vim
-" Description: Retro groove color scheme for Vim
-" Author: morhetz <morhetz@gmail.com>
-" Source: https://github.com/morhetz/gruvbox
-" Last Modified: 09 Apr 2014
-" -----------------------------------------------------------------------------
-
-function! gruvbox#invert_signs_toggle()
-  if g:gruvbox_invert_signs == 0
-    let g:gruvbox_invert_signs=1
-  else
-    let g:gruvbox_invert_signs=0
-  endif
-
-  colorscheme gruvbox
-endfunction
-
-" Search Highlighting {{{
-
-function! gruvbox#hls_show()
-  set hlsearch
-  call GruvboxHlsShowCursor()
-endfunction
-
-function! gruvbox#hls_hide()
-  set nohlsearch
-  call GruvboxHlsHideCursor()
-endfunction
-
-function! gruvbox#hls_toggle()
-  if &hlsearch
-    call gruvbox#hls_hide()
-  else
-    call gruvbox#hls_show()
-  endif
-endfunction
-
-" }}}
-
-" vim: set sw=2 ts=2 sts=2 et tw=80 ft=vim fdm=marker:

nvim.configlink/autoload/lightline/colorscheme/gruvbox.vim

@@ -1,57 +0,0 @@
-" -----------------------------------------------------------------------------
-" File: gruvbox.vim
-" Description: Gruvbox colorscheme for Lightline (itchyny/lightline.vim)
-" Author: gmoe <me@griffinmoe.com>
-" Source: https://github.com/morhetz/gruvbox
-" Last Modified: 20 Sep 2017
-" -----------------------------------------------------------------------------
-
-function! s:getGruvColor(group)
-  let guiColor = synIDattr(hlID(a:group), "fg", "gui") 
-  let termColor = synIDattr(hlID(a:group), "fg", "cterm") 
-  return [ guiColor, termColor ]
-endfunction
-
-if exists('g:lightline')
-
-  let s:bg0  = s:getGruvColor('GruvboxBg0')
-  let s:bg1  = s:getGruvColor('GruvboxBg1')
-  let s:bg2  = s:getGruvColor('GruvboxBg2')
-  let s:bg4  = s:getGruvColor('GruvboxBg4')
-  let s:fg1  = s:getGruvColor('GruvboxFg1')
-  let s:fg4  = s:getGruvColor('GruvboxFg4')
-
-  let s:yellow = s:getGruvColor('GruvboxYellow')
-  let s:blue   = s:getGruvColor('GruvboxBlue')
-  let s:aqua   = s:getGruvColor('GruvboxAqua')
-  let s:orange = s:getGruvColor('GruvboxOrange')
-  let s:green = s:getGruvColor('GruvboxGreen')
-
-  let s:p = {'normal':{}, 'inactive':{}, 'insert':{}, 'replace':{}, 'visual':{}, 'tabline':{}, 'terminal':{}}
-  let s:p.normal.left = [ [ s:bg0, s:fg4, 'bold' ], [ s:fg4, s:bg2 ] ]
-  let s:p.normal.right = [ [ s:bg0, s:fg4 ], [ s:fg4, s:bg2 ] ]
-  let s:p.normal.middle = [ [ s:fg4, s:bg1 ] ]
-  let s:p.inactive.right = [ [ s:bg4, s:bg1 ], [ s:bg4, s:bg1 ] ]
-  let s:p.inactive.left =  [ [ s:bg4, s:bg1 ], [ s:bg4, s:bg1 ] ]
-  let s:p.inactive.middle = [ [ s:bg4, s:bg1 ] ]
-  let s:p.insert.left = [ [ s:bg0, s:blue, 'bold' ], [ s:fg1, s:bg2 ] ]
-  let s:p.insert.right = [ [ s:bg0, s:blue ], [ s:fg1, s:bg2 ] ]
-  let s:p.insert.middle = [ [ s:fg4, s:bg2 ] ]
-  let s:p.terminal.left = [ [ s:bg0, s:green, 'bold' ], [ s:fg1, s:bg2 ] ]
-  let s:p.terminal.right = [ [ s:bg0, s:green ], [ s:fg1, s:bg2 ] ]
-  let s:p.terminal.middle = [ [ s:fg4, s:bg2 ] ]
-  let s:p.replace.left = [ [ s:bg0, s:aqua, 'bold' ], [ s:fg1, s:bg2 ] ]
-  let s:p.replace.right = [ [ s:bg0, s:aqua ], [ s:fg1, s:bg2 ] ]
-  let s:p.replace.middle = [ [ s:fg4, s:bg2 ] ]
-  let s:p.visual.left = [ [ s:bg0, s:orange, 'bold' ], [ s:bg0, s:bg4 ] ]
-  let s:p.visual.right = [ [ s:bg0, s:orange ], [ s:bg0, s:bg4 ] ]
-  let s:p.visual.middle = [ [ s:fg4, s:bg1 ] ]
-  let s:p.tabline.left = [ [ s:fg4, s:bg2 ] ]
-  let s:p.tabline.tabsel = [ [ s:bg0, s:fg4 ] ]
-  let s:p.tabline.middle = [ [ s:bg0, s:bg0 ] ]
-  let s:p.tabline.right = [ [ s:bg0, s:orange ] ]
-  let s:p.normal.error = [ [ s:bg0, s:orange ] ]
-  let s:p.normal.warning = [ [ s:bg2, s:yellow ] ]
-
-  let g:lightline#colorscheme#gruvbox#palette = lightline#colorscheme#flatten(s:p)
-endif

nvim.configlink/init.vim

@@ -1,12 +1,22 @@
 " Vim Config
 
-" Plugins
+" Plugin Settings
+"----------------
+
+" Install vim-plugged if not installed
+if empty(glob('~/.config/nvim/autoload/plug.vim'))
+  silent !curl -fLo ~/.config/nvim/autoload/plug.vim --create-dirs
+    \ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
+  autocmd VimEnter * PlugInstall --sync | source $MYVIMRC
+endif
 call plug#begin('~/.config/nvim/plugged')
 
+" List of plugins
+Plug 'morhetz/gruvbox'                              " Colorscheme
 Plug 'junegunn/fzf', { 'do': { -> fzf#install() } } " Required for fuzzyfinder
 Plug 'junegunn/fzf.vim'                             " Actual fuzzyfinder
 Plug 'tpope/vim-surround'                           " Enables paren editing
-Plug 'Raimondi/delimitMate'                         " Auto-close parentheses
+Plug 'tmsvg/pear-tree'                              " Auto- and smart-parentheses
 Plug 'tpope/vim-commentary'                         " Use gc or gcc to comment
 Plug 'sheerun/vim-polyglot'                         " Syntax for every language
 Plug 'vimwiki/vimwiki'                              " Wiki Markdown System
@@ -15,9 +25,10 @@ Plug 'airblade/vim-gitgutter'                       " Git next to line numbers
 Plug 'tpope/vim-fugitive'                           " Other git commands
 Plug 'machakann/vim-highlightedyank'                " Highlight text when copied
 Plug 'itchyny/lightline.vim'                        " Status bar
-Plug 'shinchu/lightline-gruvbox.vim'                " Colors for status bar
 Plug 'tpope/vim-vinegar'                            " Fixes netrw file explorer
+Plug 'lambdalisue/fern.vim'                         " File explorer / project drawer
 Plug 'christoomey/vim-tmux-navigator'               " Hotkeys for tmux panes
+Plug 'neoclide/coc.nvim', {'branch': 'release'}     " Code completion
 
 call plug#end()
 
@@ -46,6 +57,9 @@ set clipboard+=unnamedplus      " Uses system clipboard for yanking
 " Neovim only
 set inccommand=split            " Live preview search and replace
 
+" Mouse interaction / scrolling
+set mouse=nv
+
 " Remember last position
 if has("autocmd")
   au BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$") | exe "normal! g`\"" | endif
@@ -84,6 +98,9 @@ nnoremap <Leader>/ :Rg<CR>
 " Open file in this directory
 nnoremap <Leader>f :Files<cr>
 
+" Open a recent file
+nnoremap <Leader>r :History<cr>
+
 " Switch between multiple open files
 nnoremap <Leader>b :Buffers<cr>
 
@@ -103,10 +120,7 @@ nnoremap <Leader>p :Git push<cr>
 nnoremap <Leader>m :only<cr>
 
 " Open file tree
-nnoremap <Leader>t :Vexplore<cr>
+noremap <silent> <Leader>t :Fern . -drawer -width=35 -toggle<CR><C-w>=
-
-" Mouse interaction / scrolling
-set mouse=nv
 
 " Plugin Settings
 "----------------
@@ -116,19 +130,30 @@ let g:netrw_liststyle = 3               " Change style to 'tree' view
 let g:netrw_banner = 0                  " Remove useless banner
 let g:netrw_winsize = 15                " Explore window takes % of page
 let g:netrw_browse_split = 4            " Open in previous window
-let g:netrw_altv = 1                    " idk
+let g:netrw_altv = 1                    " Always split left
+
+" Pear Tree parentheses plugin
+let g:pear_tree_repeatable_expand = 0   " Don't hide paren until escape
+let g:pear_tree_smart_openers = 1       " Smart paren mode, which checks outer or inners
+let g:pear_tree_smart_closers = 1
+let g:pear_tree_smart_backspace = 1
 
 " Gitgutter plugin
 let g:gitgutter_enabled = 0             " Disable on start
 
-" Terraform Plugin
+" Polyglot syntax plugin
-let g:terraform_fmt_on_save=1
+let g:terraform_fmt_on_save=1           " Formats with terraform plugin
 
-" VimWiki Plugin
+" VimWiki plugin
-let g:vimwiki_list = [{'path': '~/Documents/notes/',
+let g:vimwiki_list = [
-                      \ 'syntax': 'markdown', 'ext': '.md'}]
+  \ {
+  \   'path': '~/Documents/notes/',
+  \   'syntax': 'markdown',
+  \   'ext': '.md'
+  \ }
+  \ ]
 
-" Status Bar Plugin
+" Lightline status bar plugin
 let g:lightline = {
   \ 'colorscheme': 'jellybeans',
   \ 'active': {
@@ -140,5 +165,3 @@ let g:lightline = {
   \   'gitbranch': 'fugitive#head'
   \ }
   \ }
-" let g:lightline.colorscheme = 'gruvbox'
-