vim and fzf synergy 2.0

This commit is contained in:
Daniel Flanagan 2016-12-01 15:13:01 -06:00
parent 1b86427435
commit 60adc97f78
3 changed files with 15 additions and 6 deletions

View file

@ -78,6 +78,7 @@ Plug 'michaeljsmith/vim-indent-object' " adds an indentation level text object
Plug 'wellle/targets.vim' " adds some more handy text objects Plug 'wellle/targets.vim' " adds some more handy text objects
Plug 'ternjs/tern_for_vim', { 'do': 'npm install' } Plug 'ternjs/tern_for_vim', { 'do': 'npm install' }
Plug 'mikewest/vimroom' Plug 'mikewest/vimroom'
Plug 'editorconfig/editorconfig-vim' " loads project-specific editor settings
let g:vimroom_sidebar_height = 0 let g:vimroom_sidebar_height = 0
Plug 'junegunn/fzf', {'dir': '~/.fzf', 'do': './install --all'} " fuzzy file finding Plug 'junegunn/fzf', {'dir': '~/.fzf', 'do': './install --all'} " fuzzy file finding
@ -130,7 +131,7 @@ autocmd BufNewFile,BufReadPost *.txt setl spell textwidth=0 wrapmargin=0
set tabstop=2 set tabstop=2
set shiftwidth=2 set shiftwidth=2
set softtabstop=2 set softtabstop=2
set noexpandtab set expandtab
set autoindent smartindent set autoindent smartindent
set list set list
set nostartofline set nostartofline
@ -342,10 +343,18 @@ vmap Q gq
nmap Q gqap nmap Q gqap
" launch fzf for the current git repo " launch fzf for the current git repo
nnoremap <C-P> :GitFiles<CR> nnoremap <C-p> :GitFiles<CR>
" super fancy buffer switching " launch fzf for files in the current directory
nnoremap <leader>l :ls<CR>:b<space> nnoremap <C-o> :Files<CR>
" launch fzf for files modified or not in git
nnoremap <C-o> :GFiles?<CR>
" launch fzf for open buffers (files)
nnoremap <leader>l :Buffers<CR>
" switch to previous buffer
nnoremap <leader>h :b#<CR> nnoremap <leader>h :b#<CR>
" use leader j and k to switch buffers as well " use leader j and k to switch buffers as well

2
env/sh/aliases vendored
View file

@ -40,7 +40,7 @@ alias tmnew="tmux new -s"
alias tmls="tmux list-sessions" alias tmls="tmux list-sessions"
alias tmatt="tmux attach -t" alias tmatt="tmux attach -t"
alias tu="tmux attach -t utils || tmux new -s utils" alias tu="tmux attach -t utils || tmux new -s utils"
alias tdf="tmux attach -t df || tmux new -s utils -c \"$DOTFILES_PATH\"" alias tdf="tmux attach -t df || tmux new -s df -c \"$DOTFILES_PATH\""
# git aliases # git aliases
alias gs="git status" alias gs="git status"

View file

@ -5,5 +5,5 @@ source $DIR/variables.bash
pacaur -S \ pacaur -S \
mopidy mopidy-spotify mopidy-gmusic \ mopidy mopidy-spotify mopidy-gmusic \
ncmpcpp mpd \ ncmpcpp mpd mpc \
--noconfirm --noedit --noconfirm --noedit