klesh/dotfiles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[misc] add fzf as part of fish installation and replace CtrlP with fzf

Browse Source
This commit is contained in:
Klesh Wong 2020-10-23 11:48:19 +08:00
parent 36f74c1ba4
commit fb30018891
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fish/install.sh
View File

@ -10,11 +10,11 @@ case "$PM" in
! which pip3 && $ROOT/python/install.sh ! which pip3 && $ROOT/python/install.sh
sudo add-apt-repository ppa:fish-shell/release-3 -y sudo add-apt-repository ppa:fish-shell/release-3 -y
sudo apt update sudo apt update
sudo apt install fish libnotify-bin xdotool -y sudo apt install fish libnotify-bin xdotool fzf -y
;; ;;
pacman) pacman)
! which pip && $ROOT/python/install.sh ! which pip && $ROOT/python/install.sh
sudo pacman -S --needed --needed fish xdotool sudo pacman -S --needed --needed fish xdotool fzf
;; ;;
esac esac
@ -31,3 +31,6 @@ lnsf $DIR/config/functions/fish_prompt.fish $XDG_CONFIG_HOME/fish/functions/fish
lnsf $DIR/config/functions/fish_right_prompt.fish $XDG_CONFIG_HOME/fish/functions/fish_right_prompt.fish lnsf $DIR/config/functions/fish_right_prompt.fish $XDG_CONFIG_HOME/fish/functions/fish_right_prompt.fish
lnsf $DIR/config/functions/fisher.fish $XDG_CONFIG_HOME/fish/functions/fisher.fish lnsf $DIR/config/functions/fisher.fish $XDG_CONFIG_HOME/fish/functions/fisher.fish
# install plugins
fish -c "fisher add jethrokuan/fzf"

23
nvim/config/init.vim
View File

@ -89,8 +89,8 @@ call plug#begin()
Plug 'editorconfig/editorconfig-vim' Plug 'editorconfig/editorconfig-vim'
Plug 'tpope/vim-surround' Plug 'tpope/vim-surround'
Plug 'jiangmiao/auto-pairs' Plug 'jiangmiao/auto-pairs'
Plug 'preservim/nerdtree' Plug 'preservim/nerdtree', { 'on': 'NERDTreeToggle' }
Plug 'posva/vim-vue' Plug 'posva/vim-vue', { 'for': 'vue' }
Plug 'tpope/vim-repeat' Plug 'tpope/vim-repeat'
"Plug 'neoclide/coc.nvim', {'branch': 'release'} "Plug 'neoclide/coc.nvim', {'branch': 'release'}
"Plug 'neoclide/coc-json', {'do': 'yarnpkg install --frozen-lockfile'} "Plug 'neoclide/coc-json', {'do': 'yarnpkg install --frozen-lockfile'}
@ -100,20 +100,26 @@ Plug 'tpope/vim-repeat'
Plug 'liuchengxu/eleline.vim' Plug 'liuchengxu/eleline.vim'
Plug 'tpope/vim-fugitive' " git 功能 Plug 'tpope/vim-fugitive' " git 功能
Plug 'scrooloose/nerdcommenter' Plug 'scrooloose/nerdcommenter'
Plug 'ctrlpvim/ctrlp.vim' "Plug 'ctrlpvim/ctrlp.vim'
Plug 'mhinz/vim-grepper', { 'on': ['Grepper', '<plug>(GrepperOperator)'] } Plug 'mhinz/vim-grepper', { 'on': ['Grepper', '<plug>(GrepperOperator)'] }
Plug 'morhetz/gruvbox' Plug 'morhetz/gruvbox'
Plug 'dag/vim-fish' Plug 'dag/vim-fish', { 'for': 'fish' }
Plug 'Vimjas/vim-python-pep8-indent' Plug 'Vimjas/vim-python-pep8-indent', { 'for': 'python' }
Plug 'chrisbra/Colorizer' Plug 'chrisbra/Colorizer'
Plug 'alvan/vim-closetag' Plug 'alvan/vim-closetag', { 'for': ['vue', 'html', 'xml'] }
Plug 'airblade/vim-gitgutter' Plug 'airblade/vim-gitgutter'
Plug 'plasticboy/vim-markdown', { 'for': 'markdown' }
Plug 'junegunn/fzf'
call plug#end() call plug#end()
" ==== vim-markdown configuration ====
let g:vim_markdown_folding_disabled = 1
" ==== vim-closetag configuration ==== " ==== vim-closetag configuration ====
let g:closetag_filetypes = 'html,xhtml,phtml,vue' let g:closetag_filetypes = 'html,xhtml,phtml,vue'
" ==== coc configuration ==== " ==== coc configuration ====
"let g:coc_disable_startup_warning = 1 "let g:coc_disable_startup_warning = 1
"nmap <silent> gd <Plug>(coc-definition) "nmap <silent> gd <Plug>(coc-definition)
@ -161,7 +167,10 @@ nnoremap <leader>gmh :diffget //2<CR>
nnoremap <leader>gml :diffget //3<CR> nnoremap <leader>gml :diffget //3<CR>
" ==== ctrlp configuration ==== " ==== ctrlp configuration ====
let g:ctrlp_user_command = ['.git', 'git ls-files -co --exclude-standard'] "let g:ctrlp_user_command = ['.git', 'git ls-files -co --exclude-standard']
" ==== fzf configuration ====
nnoremap <C-p> :FZF<CR>
" ==== gruvbox configuration ==== " ==== gruvbox configuration ====