kdeppe/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

made fzf work for vim

Browse Source
This commit is contained in:
KeeganForelight 2023-01-20 12:07:39 -05:00
parent 11fee55252
commit ac77126f7f
10 changed files with 20 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -23,9 +23,6 @@
[submodule "vim-surround"] [submodule "vim-surround"]
path = vim/pack/man/start/vim-surround path = vim/pack/man/start/vim-surround
url = https://github.com/tpope/vim-surround.git url = https://github.com/tpope/vim-surround.git
[submodule "vim-fzf"]
path = vim/pack/man/start/vim-fzf
url = https://github.com/junegunn/fzf.vim.git
[submodule "vim-airline"] [submodule "vim-airline"]
path = vim/pack/man/start/vim-airline path = vim/pack/man/start/vim-airline
url = https://github.com/vim-airline/vim-airline.git url = https://github.com/vim-airline/vim-airline.git

1
bin/fzf Symbolic link
View File

@ -0,0 +1 @@
/home/keegan/.dotfiles/src/fzf/bin/fzf

1
install.conf.yaml
View File

@ -28,6 +28,7 @@
~/.zshrc: ~/.zshrc:
force: true force: true
~/.tmux.conf: ~/.tmux.conf:
~/.fzf: src/fzf
~/.oh-my-zsh/custom: ~/.oh-my-zsh/custom:
path: oh-my-zsh/custom path: oh-my-zsh/custom
force: true force: true

2
oh-my-zsh/custom/themes/powerlevel10k

@ -1 +1 @@
Subproject commit a066b55f855c8e488d3ea9e26e861bdd5ecd4fe8 Subproject commit 21e89cb61d9ed240c1ddf6dd09ce306e7c9cf437

2
src/fzf

@ -1 +1 @@
Subproject commit 20230117636c9dfa3ed6f6428c5bc4c51b02f60a Subproject commit a79de11af78d98f3f1931870d2866012cc6e962a

2
vim/pack/man/start/vim-airline

@ -1 +1 @@
Subproject commit f46792ebcb1eb5b11d2d7f573b4a63acdddd58bf Subproject commit 31e01612f3b9eef79e6a71d4708b85505f50e255

1
vim/pack/man/start/vim-fzf

@ -1 +0,0 @@
Subproject commit bdf48c282ad2174c25c059b3cdb7956427b07a99

2
vim/pack/man/start/vimtex

@ -1 +1 @@
Subproject commit 57da13348bce93dda80d4d4494db42e07c96b018 Subproject commit c77ec4e15768ffcb97a96d1bf2df1ef58e94acdd

41
vimrc
View File

@ -59,43 +59,28 @@ let g:vimtex_view_method = 'zathura'
let g:tex_flavor='latex' let g:tex_flavor='latex'
let g:vimtex_quickfix_mode=0 let g:vimtex_quickfix_mode=0
" fzf integration " fzf settings
set rtp+=~/.fzf set rtp+=~/.fzf
let g:fzf_preview_window = ['right:50%', 'ctrl-/'] " let g:fzf_preview_window = ['right:50%', 'ctrl-/']
let g:fzf_buffers_jump = 1 " let g:fzf_buffers_jump = 1
" Customize fzf colors to match your color scheme " " Customize fzf colors to match your color scheme
" " - fzf#wrap translates this to a set of `--color` options " " " - fzf#wrap translates this to a set of `--color` options
let g:fzf_colors =
\ { 'fg': ['fg', 'Normal'],
\ 'bg': ['bg', 'Normal'],
\ 'hl': ['fg', 'Comment'],
\ 'fg+': ['fg', 'MarchParen', 'CursorLine', 'CursorColumn', 'Normal'],
\ 'bg+': ['bg', 'MatchParen', 'CursorLine', 'CursorColumn'],
\ 'hl+': ['fg', 'Constant'],
\ 'info': ['fg', 'PreProc'],
\ 'border': ['fg', 'Ignore'],
\ 'prompt': ['fg', 'Conditional'],
\ 'pointer': ['fg', 'Exception'],
\ 'marker': ['fg', 'Keyword'],
\ 'spinner': ['fg', 'Label'],
\ 'gutter' : ['bg', 'Normal'],
\ 'header': ['fg', 'Comment']}
" open in floating tmux pane if available " TMUX support
if exists('$TMUX') if exists('$TMUX')
let g:fzf_layout = { 'tmux': '-p60%,70%' } let g:fzf_layout = { 'tmux': '-p60%,70%' }
else else
let g:fzf_layout = { 'window': { 'width': 0.6, 'height': 0.7} } let g:fzf_layout = { 'window': { 'width': 0.6, 'height': 0.7} }
endif endif
" fzf functions and keybinds " " fzf functions and keybinds
command! -bang -nargs=? -complete=dir Find " command! -bang -nargs=? -complete=dir Find
\ call fzf#vim#files(<q-args>, fzf#vim#with_preview({'options': ['--layout=reverse', '--info=inline']}), <bang>0) " \ call fzf#vim#files(<q-args>, fzf#vim#with_preview({'options': ['--layout=reverse', '--info=inline']}), <bang>0)
nnoremap <silent> <leader>f :Find<CR> nnoremap <silent> <leader>f :FZF<CR>
nnoremap <silent> <leader>h :Find $HOME<CR> nnoremap <silent> <leader>F :FZF $HOME<CR>
nnoremap <silent> <leader>g :GFiles<CR> " nnoremap <silent> <leader>g :GFiles<CR>
nnoremap <silent> <leader>s :GFiles?<CR> " nnoremap <silent> <leader>s :GFiles?<CR>
" tweaking timeout to quit instatnly via esc " tweaking timeout to quit instatnly via esc
set ttimeout set ttimeout

2
zshrc
View File

@ -155,7 +155,7 @@ alias nalgene="$HOME/bin/water 32"
# source "$HOME/.dotfiles/bin/weather/location.sh" # source "$HOME/.dotfiles/bin/weather/location.sh"
#source "$HOME/.dotfiles/bin/startup/tmux_start.sh" #source "$HOME/.dotfiles/bin/startup/tmux_start.sh"
export FZF_DEFAULT_OPTS='--layout=reverse --border --height=40%' export FZF_DEFAULT_OPTS='--layout=reverse --border'
alias bat="batcat" alias bat="batcat"
alias tt="$HOME/bin/timetracker" alias tt="$HOME/bin/timetracker"