Use neovim, fzf instead of vim, ctrlp

Author: luathn

.gitignore

@@ -1,4 +1,5 @@
 vim/plugged
+vim/.netrwhist
 .directory
 
 config/mpd/*

vim/.netrwhist

@@ -35,9 +35,9 @@ let s:cterm0D = 109
 let s:cterm0E = 139
 let s:cterm0F = 131
 
-let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm04 ]
+let s:N1   = [ s:gui01, s:gui04, s:cterm01, s:cterm04 ]
 let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
-let s:N3   = [ s:gui09, s:gui01, s:cterm04, s:cterm01 ]
+let s:N3   = [ s:gui04, s:gui01, s:cterm04, s:cterm01 ]
 let g:airline#themes#base16_default#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
 
 let s:I1   = [ s:gui01, s:gui0C, s:cterm01, s:cterm0C ]
@@ -50,7 +50,7 @@ let s:R2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
 let s:R3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
 let g:airline#themes#base16_default#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
 
-let s:V1   = [ s:gui01, s:gui0E, s:cterm01, s:cterm09 ]
+let s:V1   = [ s:gui01, s:gui09, s:cterm01, s:cterm09 ]
 let s:V2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
 let s:V3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
 let g:airline#themes#base16_default#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
@@ -61,10 +61,10 @@ let s:IA3   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
 let g:airline#themes#base16_default#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
 
 let g:airline#themes#base16_default#palette.normal_modified = {
-      \ 'airline_c': ['', '', s:cterm0C, '']
+      \ 'airline_c': [s:gui0C, '', s:cterm0C, '']
       \ }
 let g:airline#themes#base16_default#palette.inactive_modified = {
-      \ 'airline_c': ['', '', s:cterm0C, '']
+      \ 'airline_c': [s:gui0C, '', s:cterm0C, '']
       \ }
 
 " Here we define the color map for ctrlp.  We check for the g:loaded_ctrlp

vim/autoload/airline/themes/base16_default.vim

@@ -1,5 +1,5 @@
 " vi:syntax=vim
-let base16colorspace=256
+" let base16colorspace=256
 
 " base16-vim (https://github.com/chriskempson/base16-vim)
 " by Chris Kempson (http://chriskempson.com)
@@ -8,12 +8,12 @@ let base16colorspace=256
 " This enables the coresponding base16-shell script to run so that
 " :colorscheme works in terminals supported by base16-shell scripts
 " User must set this variable in .vimrc
-let g:base16_shell_path="~/.config/base16-shell/scripts"
-if !has("gui_running")
-  if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-default-dark.sh"
-  endif
-endif
+" let g:base16_shell_path="~/.config/base16-shell/scripts"
+" if !has("gui_running")
+"   if exists("g:base16_shell_path")
+"     execute "silent !/bin/sh ".g:base16_shell_path."/base16-default-dark.sh"
+"   endif
+" endif
 
 " GUI color definitions
 let s:gui00        = "181818"
@@ -209,7 +209,7 @@ call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
 call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm00, "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
 call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
 call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")

vim/colors/base16-default-dark.vim

@@ -3,7 +3,8 @@
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 call plug#begin('~/.vim/plugged')
 " Main plugin
-Plug 'ctrlpvim/ctrlp.vim'
+Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
+Plug 'junegunn/fzf.vim'
 Plug 'mileszs/ack.vim'
 Plug 'neoclide/coc.nvim', {'branch': 'release'}
 Plug 'dense-analysis/ale'
@@ -26,7 +27,6 @@ Plug 'tpope/vim-endwise'
 Plug 'neoclide/coc-python', {'do': 'yarn install --frozen-lockfile'}
 " Frontend
 Plug 'pangloss/vim-javascript'
-Plug 'ap/vim-css-color'
 " UI
 Plug 'vim-airline/vim-airline'
 Plug 'morhetz/gruvbox'
@@ -68,7 +68,10 @@ set so=7                      " Set 7 lines to the cursor
 set laststatus=2
 set ruler
 set wildmenu
-au FocusGained,BufEnter * :checktime
+
+if (has("termguicolors"))
+  set termguicolors
+endif
 
 " Scheme
 colorscheme base16-default-dark
@@ -78,6 +81,10 @@ set background=dark
 " Enable matchit for ruby textobject
 runtime macros/matchit.vim
 
+" Autocmd
+au FocusGained,BufEnter * :checktime
+autocmd TermOpen * setlocal nonumber norelativenumber
+
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Mappings                                                                    "
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
@@ -127,7 +134,10 @@ map <leader>tr :NERDTreeRefreshRoot<cr>
 
 " Ack
 nnoremap <leader>a :Ack!<Space>
-map <leader>l :CtrlPBuffer<cr>
+
+" Fzf
+nnoremap <silent> <c-p> :Files<cr>
+nnoremap <silent> <leader>l :Buffers<cr>
 
 " others
 map <leader>= :ALEFix<cr>
@@ -190,16 +200,34 @@ inoremap <expr> <C-j> pumvisible() ? "\<C-n>" : "\<Tab>"
 inoremap <expr> <C-k> pumvisible() ? "\<C-p>" : "\<S-Tab>"
 inoremap <expr> <S-Tab> pumvisible() ? "\<C-p>" : "\<S-Tab>"
 
-" CtrlP Fuzzy Search
+" Fzf
+let $FZF_DEFAULT_OPTS .= '--inline-info'
+let g:fzf_layout = { 'down': '~30%' }
+
+autocmd! FileType fzf tnoremap <buffer> <esc> <c-c>
+autocmd! FileType fzf
+autocmd  FileType fzf set laststatus=0 noshowmode noruler
+  \| autocmd BufLeave <buffer> set laststatus=2 showmode ruler
+
 let g:fzf_action = {
       \ 'ctrl-t': 'tab split',
       \ 'ctrl-s': 'split',
       \ 'ctrl-v': 'vsplit' }
-let g:ctrlp_custom_ignore = 'node_modules\|^\.DS_Store\|^\.git\|^\.coffee'
-if executable('ag')
-  set grepprg=ag\ --nogroup\ --nocolor
-  let g:ctrlp_user_command = 'ag %s -l --nocolor -g ""'
-endif
+
+let g:fzf_colors =
+\ { 'fg':      ['fg', 'Normal'],
+  \ 'bg':      ['bg', 'Normal'],
+  \ 'hl':      ['fg', 'Comment'],
+  \ 'fg+':     ['fg', 'CursorLine', 'CursorColumn', 'Normal'],
+  \ 'bg+':     ['bg', 'CursorLine', 'CursorColumn'],
+  \ 'hl+':     ['fg', 'Statement'],
+  \ 'info':    ['fg', 'PreProc'],
+  \ 'border':  ['fg', 'Ignore'],
+  \ 'prompt':  ['fg', 'Conditional'],
+  \ 'pointer': ['fg', 'Exception'],
+  \ 'marker':  ['fg', 'Keyword'],
+  \ 'spinner': ['fg', 'Label'],
+  \ 'header':  ['fg', 'Comment'] }
 
 " Ale plugin
 let b:ale_linters = ['flake8', 'pylint']

vim/vimrc renamed to vim/init.vim

@@ -91,6 +91,9 @@ bindkey '^ ' autosuggest-accept
 
 export EDITOR='vim'
 
+export FZF_DEFAULT_COMMAND='fd --type file --follow --hidden --exclude .git'
+export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND"
+
 # export MANPATH="/usr/local/man:$MANPATH"
 
 # You may need to manually set your language environment
@@ -115,3 +118,5 @@ export TLDR_QUOTE='italic'
 export TLDR_DESCRIPTION='green'
 export TLDR_CODE='red'
 export TLDR_PARAM='blue'
+
+[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh