diff options
| -rw-r--r-- | env/.zshrc | 4 | ||||
| -rw-r--r-- | nvim/.config/nvim/vim-plug/plugins.vim | 6 | ||||
| -rw-r--r-- | nvim/.vimrc | 5 |
3 files changed, 12 insertions, 3 deletions
@@ -14,6 +14,10 @@ zmodload zsh/complist compinit _comp_options+=(globdots) +# FZF +source /usr/share/fzf/key-bindings.zsh +source /usr/share/fzf/completion.zsh + # Edit line in vim with ctrl-e: autoload edit-command-line; zle -N edit-command-line bindkey '^e' edit-command-line diff --git a/nvim/.config/nvim/vim-plug/plugins.vim b/nvim/.config/nvim/vim-plug/plugins.vim index 3b5d17c..c892b6a 100644 --- a/nvim/.config/nvim/vim-plug/plugins.vim +++ b/nvim/.config/nvim/vim-plug/plugins.vim @@ -1,13 +1,15 @@ call plug#begin('~/.config/nvim/autoload/plugged') Plug 'mhinz/vim-startify', {'branch': 'center'} Plug 'vimwiki/vimwiki' - Plug 'mattn/calendar-vim' Plug 'tonchis/vim-to-github' " Dark-powered file explorer Plug 'shougo/defx.nvim', Plug 'kristijanhusak/defx-icons' Plug 'kristijanhusak/defx-git' Plug 't9md/vim-choosewin' + " FZF + Plug 'junegunn/fzf', { 'do': { -> fzf#install() } } + Plug 'junegunn/fzf.vim' " Tmux navigator Plug 'christoomey/vim-tmux-navigator' " Color scheme @@ -24,6 +26,4 @@ call plug#begin('~/.config/nvim/autoload/plugged') Plug 'airblade/vim-gitgutter' " Matching brackets Plug 'Raimondi/delimitMate' - " Hardime - Plug 'takac/vim-hardtime' call plug#end() diff --git a/nvim/.vimrc b/nvim/.vimrc index eae5d84..6aede5d 100644 --- a/nvim/.vimrc +++ b/nvim/.vimrc @@ -47,6 +47,11 @@ nnoremap <c-j> <C-w>j nnoremap <c-k> <C-w>k nnoremap <c-l> <C-w>l +# fzf.vim +nnoremap <leader>r :Rg<CR> +nnoremap <leader>f :FZF<CR> +nnoremap <leader>g :GFiles<CR> + " Defx nnoremap <silent> <F3> :Defx<CR> autocmd FileType defx call s:defx_my_settings() |