fix: Clean mappings and plugins

Author: sheoak

mapping.vim

@@ -20,7 +20,7 @@ noremap <Space> <PageDown>
 tnoremap <C-g> <C-\><C-n>
 
 " ----------------------------------------------------------------------------
-" Plugin pre-configuration for bepotimist
+" Plugin pre-configuration for bepoptimist
 " It needs to be in the main configuration because of loading priorities
 " ----------------------------------------------------------------------------
 let g:surround_no_mappings = 1
@@ -88,44 +88,43 @@ inoremap <expr> <c-x><c-l> fzf#vim#complete(fzf#wrap({
             \ 'reducer': { lines -> join(split(lines[0], ':\zs')[2:], '') }}))
 
 
-" Executing
+" Executing (mostly leader key)
 " -----------------------------------------------------------------------------
+command! DiffOrig vert new | set bt=nofile | r # | 0d_ | diffthis
+            \ | wincmd p | diffthis
 
-nmap <leader>p <Nop>
-nmap <leader>s <Nop>
 " ALE
-nmap <leader>af <Plug>(ale_fix)
 nmap <leader>ad <Plug>(ale_detail)
-" Bexec
-vmap <leader>x :call bexec#Visual()<CR>
-nmap <leader>x :call bexec#Normal()<CR>
-nmap <leader>l :call bexec#Live()<CR>
-nmap <leader>pi :PlugInstall<CR>
-nmap <leader>pu :PlugUpdate<CR>
-nmap <leader>pU :PlugUpgrade<CR>
-nmap <leader>pc :PlugClean<CR>
-nmap <leader>ps :PlugStatus<CR>
-nmap <leader>pd :PlugDiff<CR>
-nmap <leader>pI :w<CR>:source ~/.config/nvim/init.vim<CR>:PlugInstall<CR>
-nmap <leader>m :make<CR>
-nmap <leader>tt :!tox<CR>
-nmap <leader>tp :!pytest<CR>
+nmap <leader>af <Plug>(ale_fix)
 " css colors insert/convert via plugins
-nmap <leader>ch :VCoolor<CR>
-nmap <leader>cr :VCoolIns r<CR>
+nmap <leader>cA :ConvertColorTo rgba<CR>
 nmap <leader>ca :VCoolIns ra<CR>
 nmap <leader>cH :ConvertColorTo hex<CR>
+nmap <leader>ch :VCoolor<CR>
 nmap <leader>cR :ConvertColorTo rgb<CR>
-nmap <leader>cA :ConvertColorTo rgba<CR>
+nmap <leader>cr :VCoolIns r<CR>
+nnoremap <leader>do :DiffOrig<CR>
 " Order all css properties
 nnoremap <leader>cs :<C-u>g/{/ .+1,/}/-1 sort<CR>
-
-command! DiffOrig vert new | set bt=nofile | r # | 0d_ | diffthis
-            \ | wincmd p | diffthis
-nnoremap <leader>do :DiffOrig<CR>
+nmap <leader>f :Prettier<CR>
+nmap <leader>m :make<CR>
+nmap <leader>pc :PlugClean<CR>
+nmap <leader>pd :PlugDiff<CR>
+nmap <leader>pi :PlugInstall<CR>
+nmap <leader>pI :w<CR>:source ~/.config/nvim/init.vim<CR>:PlugInstall<CR>
+nmap <leader>p <Nop>
+nmap <leader>ps :PlugStatus<CR>
+nmap <leader>pu :PlugUpdate<CR>
+nmap <leader>pU :PlugUpgrade<CR>
+nmap <leader>s <Nop>
+nmap <leader>tp :!pytest<CR>
+nmap <leader>tt :!tox<CR>
+" Bexec
+nmap <leader>X :call bexec#Live()<CR>
+nmap <leader>x :call bexec#Normal()<CR>
+vmap <leader>x :call bexec#Visual()<CR>
 " Clean dirty white space (EOL)
 nnoremap <leader><space> :silent! %s/\s\+$//<CR>
-
 " Forgotten unbreakable spaces… for French only
 " TODO: operator cleaner?
 nnoremap <leader>  :%s/\(\S\) \([:;?!]\)/\1 \2/g<CR>
@@ -136,7 +135,6 @@ nnoremap <leader>  :%s/\(\S\) \([:;?!]\)/\1 \2/g<CR>
 " vim-bookmarks
 nnoremap ms <Plug>BookmarkShowAll
 
-
 " Experiment
 " Repeat on all selected lines
 vmap . :normal .

plugin.default.vim

@@ -13,9 +13,16 @@ let g:python3_host_prog=expand('~/.virtualenvs/neovim3/bin/python')
 let g:user_emmet_install_global = 0
 
 " ALE
-let g:ale_fixers = ['prettier', 'stylelint', 'eslint', 'autopep8', 'yapf',
-            \   'remove_trailing_lines', 'trim_whitespace' ]
-let b:ale_warn_about_trailing_whitespace = 0
+let g:ale_fixers = {
+\   '*': ['remove_trailing_lines', 'trim_whitespace', 'stylelint'],
+\   'python': ['autopep8', 'yapf'],
+\   'javascript': ['eslint'],
+\   'vue': ['eslint']
+\}
+let g:ale_warn_about_trailing_whitespace = 0
+let g:ale_linters = {
+\   '*': ['eslint']
+\ }
 
 " vim-rooter
 let g:rooter_patterns = ['Rakefile', '.git/', 'package.json', '.projectroot']
@@ -194,3 +201,11 @@ let g:vcoolor_disable_mappings = 1
 " thesaurus_query
 " undocumented option to remove mappings
 let g:tq_map_keys = 0
+
+" prettier
+let g:prettier#exec_cmd_async = 1
+let g:prettier#quickfix_enabled = 0
+let g:prettier#quickfix_auto_focus = 0
+let g:prettier#autoformat = 0
+"let g:prettier#config#semi = 'false'
+let g:prettier#config#config_precedence = 'file-override'

plugin.denite.vim

@@ -39,6 +39,7 @@ endfunction
 let s:denite_options = {
       \ 'prompt' : '❯',
       \ 'start_filter': 1,
+      \ 'split': 'floating',
       \ 'winheight': 11,
       \ 'source_names': 'short',
       \ 'direction': 'botright',

plugin.vim

@@ -5,20 +5,34 @@
 " ----------------------------------------------------------------------------
 " Disabled plugins
 " ----------------------------------------------------------------------------
-" Plug 'bfredl/nvim-ipy'
-" Plug 'plytophogy/vim-virtualenv'
-" Plug 'kana/vim-operator-user'          " Grammarous dep
-" Plug 'kristijanhusak/deoplete-phpactor', { 'for': 'php' }
-" Plug 'AndrewRadev/sideways.vim'        " Moving arguments and attributes
 " Plug 'airblade/vim-rooter'             " Auto cd to project dir
-" Plug 'jaxbot/browserlink.vim', { 'for': ['html', 'css', 'js', 'sass', 'scss'] }
 
 " ----------------------------------------------------------------------------
 " Under testing …
 " ----------------------------------------------------------------------------
 Plug 'chrisbra/csv.vim'
 Plug 'SidOfc/mkdx'                     " Markdown goodies
 
+Plug 'prettier/vim-prettier', {
+  \ 'do': 'npm install',
+  \ 'branch': 'release/1.x',
+  \ 'for': [
+    \ 'javascript',
+    \ 'typescript',
+    \ 'css',
+    \ 'less',
+    \ 'scss',
+    \ 'json',
+    \ 'graphql',
+    \ 'markdown',
+    \ 'vue',
+    \ 'lua',
+    \ 'php',
+    \ 'python',
+    \ 'ruby',
+    \ 'html',
+    \ 'swift' ] }
+
 " ----------------------------------------------------------------------------
 " My custom plugins
 " ----------------------------------------------------------------------------
@@ -40,7 +54,6 @@ Plug 'vim-airline/vim-airline-themes'  " Airline themes
 " ----------------------------------------------------------------------------
 " Shougo plugin suite
 " ----------------------------------------------------------------------------
-"Plug 'Shougo/denite.nvim', { 'tag': '2.1' }
 Plug 'Shougo/denite.nvim'
 if has('nvim')
     Plug 'Shougo/deoplete.nvim',
@@ -56,7 +69,6 @@ Plug 'Shougo/neosnippet'
 Plug 'Shougo/neosnippet-snippets'
 
 " Extra sources
-Plug 'kmnk/denite-dirmark'
 Plug 'pocari/vim-denite-emoji'
 Plug 'deoplete-plugins/deoplete-zsh'
 Plug 'wokalski/autocomplete-flow', { 'for': 'js' }
@@ -66,7 +78,6 @@ Plug 'zchee/deoplete-jedi',      { 'for': 'python' }
 " ----------------------------------------------------------------------------
 " All languages plugins
 " ----------------------------------------------------------------------------
-Plug 'tpope/vim-obsession'             " Actually usable session system
 Plug 'tpope/vim-fugitive'              " Git integration
 Plug 'tpope/vim-surround'              " Motions around words
 Plug 'tpope/vim-repeat'                " Missing repeat with dot
@@ -77,14 +88,12 @@ Plug 'tpope/vim-sleuth'                " Detect tab settings
 Plug 'Ron89/thesaurus_query.vim'       " Synonyms
 Plug 'junegunn/fzf.vim'                " fuzzy find wrapper
 Plug 'mhinz/vim-startify'              " Startup screen
-Plug 'terryma/vim-multiple-cursors'    " Multi-selection (c-n)
 Plug 'MattesGroeger/vim-bookmarks'     " Annotations
 Plug 'ludovicchabant/vim-gutentags'    " Ctags generation
 Plug 'justinmk/vim-sneak'              " Multiline f/F/t/T
 Plug 'wellle/targets.vim'              " Additionnal text objects: cin) or da,…
 Plug 'bkad/CamelCaseMotion'            " Additionnal CamelCase motions
 Plug 'michaeljsmith/vim-indent-object' " Indentation text objects
-Plug 'jeetsukumaran/vim-indentwise'    " Motion for indentations
 Plug 'jeetsukumaran/vim-pythonsense'   " Additionnal python text-objects
 Plug 'PeterRincker/vim-argumentative'  " Switch arguments
 Plug 'junegunn/goyo.vim'               " Minimalist interface on demand
@@ -101,6 +110,7 @@ Plug 'francoiscabrol/ranger.vim'       " Ranger integration
 Plug 'aperezdc/vim-template'           " Auto-template when opening new file
 Plug 'sheoak/vim-snippets'             " Snippets for different languages
 Plug 'diepm/vim-rest-console'          " Call REST API from vim
+Plug 'kana/vim-operator-user'          " Grammarous dep
 Plug 'rhysd/vim-grammarous'            " Grammar check
 Plug 'osyo-manga/vim-over'             " Live matching on command line