Merge pull request #17 from jotyGill/develop

Develop

.zshrc

@@ -25,4 +25,9 @@ source $ZSH/oh-my-zsh.sh
 
 
 # Configs that can only work after "source $ZSH/oh-my-zsh.sh", such as Aliases that depend oh-my-zsh plugins
+
+# Now source fzf.zsh , otherwise Ctr+r is overwritten by ohmyzsh
+[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
+export FZF_DEFAULT_OPS="--extended"
+
 alias k="k -h"       # show human readable file sizes, in kb, mb etc

ezshrc.zsh

@@ -136,11 +136,6 @@ export PATH=$PATH:~/.config/ezsh/bin
 NPM_PACKAGES="${HOME}/.npm"
 PATH="$NPM_PACKAGES/bin:$PATH"
 
-[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
-export FZF_DEFAULT_OPS="--extended"
-
-export MARKER_KEY_NEXT_PLACEHOLDER="\C-b"   #change maker key binding from Ctr+t to Ctr+b
-
 [[ -s "$HOME/.config/ezsh/marker/marker.sh" ]] && source "$HOME/.config/ezsh/marker/marker.sh"
 
 autoload -U compinit && compinit -C -d ~/.cache/zsh/.zcompdump        # zsh-completions