From 57eb54e2d522475f8a50a841752530c17ec69a2c Mon Sep 17 00:00:00 2001
From: Andrejus <hi@andrejus.uk>
Date: Sat, 6 Jun 2020 14:25:47 +0100
Subject: [PATCH] vim fixes and prettier config

---
 install/00-apt-pkglist | 1 +
 install/13-nvm.sh      | 2 +-
 install/16-vim.sh      | 7 ++++---
 vim/init.vim           | 6 +++++-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/install/00-apt-pkglist b/install/00-apt-pkglist
index 2597133..a9dfe65 100644
--- a/install/00-apt-pkglist
+++ b/install/00-apt-pkglist
@@ -4,6 +4,7 @@ neovim
 net-tools
 openssh-client
 openssh-server
+ripgrep
 ruby-full
 software-properties-common
 tmux
diff --git a/install/13-nvm.sh b/install/13-nvm.sh
index 2f2276a..c009308 100755
--- a/install/13-nvm.sh
+++ b/install/13-nvm.sh
@@ -13,7 +13,7 @@ if not_installed "nvm"; then
     nvm install node
     nvm install iojs
     nvm alias default lts/erbium
-    
+
 fi
 
 printf "nvm is installed, upgrading...\n"
diff --git a/install/16-vim.sh b/install/16-vim.sh
index 16e45f4..9930723 100755
--- a/install/16-vim.sh
+++ b/install/16-vim.sh
@@ -14,9 +14,10 @@ fi
 nvim -E PlugInstall -c q
 nvim -E PluginInstall -c q
 
-sudo pip3 install neovim
-sudo yarn global add neovim
-sudo gen install neovim
+pip3 install neovim
+node --version
+yarn global add neovim
+sudo gem install neovim
 
 nvim --version
 
diff --git a/vim/init.vim b/vim/init.vim
index 2344dae..11a790c 100644
--- a/vim/init.vim
+++ b/vim/init.vim
@@ -112,6 +112,9 @@ inoremap <silent><expr> <TAB>
 "Close preview window when completion is done.
 autocmd! CompleteDone * if pumvisible() == 0 | pclose | endif
 
+" Allow use of :Prettier
+command! -nargs=0 Prettier :CocCommand prettier.formatFile
+
 " === NeoSnippet === "
 " Map <C-k> as shortcut to activate snippet if available
 imap <C-k> <Plug>(neosnippet_expand_or_jump)
@@ -387,10 +390,12 @@ nmap <C-l> <C-w>l
 "   <leader>dr    - Jump to references of current symbol
 "   <leader>dj    - Jump to implementation of current symbol
 "   <leader>ds    - Fuzzy search current project symbols
+"   <leader>p     - Run Prettier formatter on file
 nmap <silent> <leader>dd <Plug>(coc-definition)
 nmap <silent> <leader>dr <Plug>(coc-references)
 nmap <silent> <leader>dj <Plug>(coc-implementation)
 nnoremap <silent> <leader>ds :<C-u>CocList -I -N --top symbols<CR>
+nmap <silent> <leader>p  :Prettier<CR>
 
 " === vim-better-whitespace === "
 "   <leader>y - Automatically remove trailing whitespace
@@ -418,7 +423,6 @@ nmap <leader>z :JsDoc<CR>
 " Vim's default buffer
 vnoremap <leader>p "_dP
 
-
 " ============================================================================ "
 " ===                                 MISC.                                === "
 " ============================================================================ "