From 69c5868c40159e79a4f438f446687f7445a3e160 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20Wo=C5=BAniak?= <y0rune@aol.com>
Date: Tue, 6 Apr 2021 09:25:31 +0200
Subject: [PATCH] vim-piryyer
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Marcin Woźniak <y0rune@aol.com>
---
 .config/nvim/init.vim | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 1f07c51..61fe86c 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -26,15 +26,14 @@ Plug 'ap/vim-css-color'
 Plug 'tpope/vim-surround'
 Plug 'neoclide/coc.nvim', {'branch': 'release'}
 Plug 'neoclide/coc-solargraph', {'do': 'gem install solargraph'}
-Plug 'fannheyward/coc-pyright', {'do': 'yarn install --frozen-lockfile; sudo npm install -g npx-run; pip install --user jedi'}
+Plug 'fannheyward/coc-pyright', {'do': 'yarn install --frozen-lockfile; npm i -D npx-run; pip install --user jedi'}
 Plug 'neoclide/coc-yaml', {'do': 'yarn install --frozen-lockfile'}
 Plug 'neoclide/coc-json', {'do': 'yarn install --frozen-lockfile'}
-Plug 'fannheyward/coc-markdownlint', {'do': 'yarn install --frozen-lockfile; sudo npm install markdownlint --save-dev'}
-Plug 'josa42/coc-sh', {'do': 'yarn install --frozen-lockfile; sudo npm i -g bash-language-server'}
-Plug 'neoclide/coc-prettier', {'do': 'yarn install --frozen-lockfile'}
+Plug 'fannheyward/coc-markdownlint', {'do': 'yarn install --frozen-lockfile; npm i -D markdownlint --save-dev'}
+Plug 'josa42/coc-sh', {'do': 'yarn install --frozen-lockfile; npm i -D bash-language-server'}
+Plug 'prettier/vim-prettier', { 'do': 'yarn install; npm i -D prettier; npm i -D prettier-plugin-sh' }
 Plug 'dracula/vim', { 'as': 'dracula'}
 Plug 'jnurmine/Zenburn', { 'as': 'zenburn'}
-Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
 Plug 'junegunn/fzf.vim'
 call plug#end()
 
@@ -59,10 +58,18 @@ syntax on
 filetype plugin indent on
 set encoding=utf-8
 
+" Prettier
+noremap <leader>p :PrettierAsync<CR>
+let g:prettier#config#single_quote = 'true'
+let g:prettier#config#trailing_comma = 'all'
+
 " fzf
-" https://github.com/masukomi/masuconfigs/blob/master/.vimrc
+command! -bang -nargs=* Find call fzf#vim#grep('rg --column --line-number --no-heading --fixed-strings --ignore-case --hidden --follow --color "always" '.shellescape(<q-args>), 1, <bang>0)
+command! -bang -nargs=* FindCurrentWord call fzf#vim#grep('rg --column --line-number --no-heading --fixed-strings --ignore-case --hidden --follow --color "always" '.shellescape(expand('<cword>')), 1, <bang>0)
+set grepprg=rg\ --vimgrep
 nmap <Leader>f :FZF<CR>
 nmap <Leader>b :Buffers<CR>
+nmap <Leader>s :Files<CR>
 nmap <Leader>/ :Rg<CR>
 
 " livepreviewer