From 65ee0ef0b4200cae841819d33d4348c4ca832272 Mon Sep 17 00:00:00 2001
From: JGill <joty@mygnu.org>
Date: Wed, 13 Oct 2021 12:44:08 +0530
Subject: [PATCH 1/2] Fix Ctr+r setup by fzf

---
 .zshrc     | 5 +++++
 ezshrc.zsh | 3 ---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.zshrc b/.zshrc
index cbcf014..518d104 100644
--- a/.zshrc
+++ b/.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
diff --git a/ezshrc.zsh b/ezshrc.zsh
index 580ff7a..c5a5cc1 100644
--- a/ezshrc.zsh
+++ b/ezshrc.zsh
@@ -136,9 +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"

From bc448c565d7b7b8252006b6ef7b0685a8dc5b99d Mon Sep 17 00:00:00 2001
From: JGill <joty@mygnu.org>
Date: Thu, 14 Oct 2021 16:26:13 +0530
Subject: [PATCH 2/2] Changed the Marker key upstream instead

---
 ezshrc.zsh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ezshrc.zsh b/ezshrc.zsh
index c5a5cc1..7485a0d 100644
--- a/ezshrc.zsh
+++ b/ezshrc.zsh
@@ -136,8 +136,6 @@ export PATH=$PATH:~/.config/ezsh/bin
 NPM_PACKAGES="${HOME}/.npm"
 PATH="$NPM_PACKAGES/bin:$PATH"
 
-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