diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index 1f07c51..eb1b76a 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 '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 'neoclide/coc-prettier', {'do': 'yarn install --frozen-lockfile'} 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 p :PrettierAsync +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(), 1, 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('')), 1, 0) +set grepprg=rg\ --vimgrep nmap f :FZF nmap b :Buffers +nmap s :Files nmap / :Rg " livepreviewer