Fix FZF

zsh/.bash_profile

@@ -11,7 +11,6 @@ export EDITOR='nvim'
 
 HISTCONTROL=ignoreboth
 
-
 export DEVKITPRO=/opt/devkitpro
 export DEVKITARM=${DEVKITPRO}/devkitARM
 export DEVKITPPC=${DEVKITPRO}/devkitPPC

zsh/.bash_profile.google

@@ -36,24 +36,12 @@ fi
 
 # Install fzf-query
 export PATH="${PATH}:/google/bin/releases/editor-devtools"
-# General fzf settings.
-export FZF_DEFAULT_OPTS=" \
-  --inline-info \
-  --reverse \
-  --color=fg+:#F8F8F8,bg+:#515559,pointer:#F8F8F8,marker:226 \
-  --bind=ctrl-e:select-all+accept \
-  --bind=ctrl-d:half-page-down \
-  --bind=ctrl-e:half-page-up
-  --bind=ctrl-t:toggle+down
-  --bind=ctrl-b:toggle+up
-  --bind=ctrl-g:select-all+accept \
-  "
+
 # Preview code with pygmentize.
 export FZF_CS_PREVIEW_COMMAND="python third_party/py/pygments/google/google_pygmentize.py -f terminal16m -O style=native"
 # Preview highlight: foreground: RG(248, 248, 248) = #F8F8F8, background: RGB(81, 85, 89) = #515559.
 export FZF_CS_PREVIEW_HIGHLIGHT="\x1b[38;2;248;248;248m\x1b[48;2;81;85;89m"
 
-source ~/fzf-at-google.zsh
 source ~/g3path.zsh
 source /etc/bash_completion.d/hgd
 
@@ -77,3 +65,5 @@ alias hgd='source /google/src/head/depot/google3/experimental/fig_contrib/hgshor
 
 export ACID_STARTUP_SCRIPT_PATH=~/acid_startup.sh
 export PATH=$PATH:/usr/local/google/home/cnieves/.local/binexport PATH=$PATH:/usr/local/google/home/cnieves/.local/bin
+
+source ~/fzf-at-google.zsh

zsh/.zshrc

@@ -21,7 +21,7 @@ if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]
 fi
 # To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
 # [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
-# plugins=(zsh-autosuggestions zsh-syntax-highlighting)
+plugins=(zsh-autosuggestions zsh-syntax-highlighting)
 
 ZSH_THEME=powerlevel10k/powerlevel10k
 DISABLE_AUTO_TITLE=true
@@ -30,7 +30,6 @@ bindkey "^A" beginning-of-line
 bindkey "^E" end-of-line
 bindkey "^K" kill-line
 bindkey "^L" clear-screen
-bindkey "^R" history-incremental-search-backward
 bindkey "^U" kill-whole-line
 bindkey "^W" backward-kill-word
 bindkey "^Y" yank
@@ -247,8 +246,8 @@ zstyle :bracketed-paste-magic paste-finish pastefinish
 # "transport endpoint is not connected" errors
 autoload -Uz add-zsh-hook
 
-export FZF_DEFAULT_OPTS="--preview 'echo {}' --preview-window down:3:wrap --bind ?:toggle-preview"
-
-source ~/.bash_profile
+[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
 export ZSH="$HOME/.oh-my-zsh"
 source $ZSH/oh-my-zsh.sh
+
+source ~/.bash_profile