Merge branch 'master' keanuplayz/dotfiles

2021-01-30 14:17:16 +01:00 · 2021-01-30 14:17:16 +01:00 · 482828639e
parent a659106248 b45d969f0c
commit 482828639e
3 changed files with 2 additions and 3 deletions
--- a/git/gitignore_global
+++ b/git/gitignore_global
@ -2,3 +2,4 @@ Session.vim
 .project.vim
 .DS_Store
 .ropeproject
+*~
--- a/nvim/plugin/interface.vim
+++ b/nvim/plugin/interface.vim
@ -147,7 +147,7 @@ endif
  nnoremap <silent> <leader>f <Cmd>Files<CR>
  nnoremap <silent> <leader>b <Cmd>Buffers<CR>
  let g:fzf_layout = { 'down': '~40%' }
-  let $FZF_DEFAULT_OPTS = '--preview-window=sharp'
+  let g:fzf_preview_window = ['right:noborder', 'ctrl-/']
 " }}}


--- a/zsh/env.zsh
+++ b/zsh/env.zsh
@ -30,6 +30,4 @@ jq_colors=(
 export JQ_COLORS="${(j.:.)jq_colors}"
 unset jq_colors

-export FZF_DEFAULT_OPTS='--preview-window=sharp'
-
 export HOMEBREW_NO_AUTO_UPDATE=1