From f2f68e2873daff15f81252a4848c7cbc8f547331 Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt <ambrevar@gmail.com>
Date: Tue, 9 May 2017 00:17:07 +0530
Subject: [PATCH] fish: Use vi bindings

---
 .../functions/fish_user_key_bindings.fish     |  8 +++++-
 .config/fish/fzf.fish                         | 25 +++++++++++++------
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/.config/fish/functions/fish_user_key_bindings.fish b/.config/fish/functions/fish_user_key_bindings.fish
index b2d26f39..da1aa73e 100644
--- a/.config/fish/functions/fish_user_key_bindings.fish
+++ b/.config/fish/functions/fish_user_key_bindings.fish
@@ -1,9 +1,15 @@
 function fish_user_key_bindings
+	fish_vi_key_bindings
+	set fish_escape_delay_ms 10
+
 	## fzf
 	if type -pq fzf
 		source $fish_config_path/fzf.fish
 	end
 
-	bind \el downcase-word
+	# bind \el downcase-word # For Emacs bindings only.
 	bind \cw trim_trailing_slashes
+
+	## As of fish 2.5, Alt-f binding is missing in vi-mode.
+	bind -M insert \ef forward-word
 end
diff --git a/.config/fish/fzf.fish b/.config/fish/fzf.fish
index d83ffb36..388edbcd 100644
--- a/.config/fish/fzf.fish
+++ b/.config/fish/fzf.fish
@@ -1,8 +1,15 @@
 fzf_key_bindings
-bind \cT transpose-chars
-bind \e\ct fzf-file-widget
-bind \ec capitalize-word
-bind \eC fzf-cd-widget
+
+## Emacs bindings
+# bind \cT transpose-chars
+# bind \e\ct fzf-file-widget
+# bind \ec capitalize-word
+# bind \eC fzf-cd-widget
+
+bind -M insert \et fzf-file-widget
+bind t fzf-file-widget
+bind r fzf-history-widget
+bind -m insert C fzf-cd-widget
 
 function fzf-select -d 'Eval commandline, fzf result and print out selection'
 	set -l cmd (commandline -j)
@@ -12,6 +19,7 @@ function fzf-select -d 'Eval commandline, fzf result and print out selection'
 	commandline -f repaint
 end
 bind \e\cm fzf-select
+bind m fzf-select
 
 ## TODO: 'complete' is not completely finished, keep original version for now.
 ## We need a way to distinguish escape content from unescaped content:
@@ -50,7 +58,8 @@ function fzf-complete -d 'fzf completion and print selection back to commandline
 end
 bind \t fzf-complete
 bind \e\t complete
-
+bind -M insert \t fzf-complete
+bind -M insert \e\t complete
 
 function fzf-bcd-widget -d 'cd backwards'
 	## TODO: (fish upsteam bug) Cannot use eval here.
@@ -59,7 +68,8 @@ function fzf-bcd-widget -d 'cd backwards'
 	[ "$result" ]; and cd $result
 	commandline -f repaint
 end
-bind \e\cL fzf-bcd-widget
+# bind \e\cL fzf-bcd-widget
+bind -m insert / fzf-bcd-widget
 
 function fzf-cdhist-widget -d 'cd to one of the previously visited locations'
 	## Clear non-existent folders from cdhist.
@@ -77,4 +87,5 @@ function fzf-cdhist-widget -d 'cd to one of the previously visited locations'
 	[ "$result" ]; and cd $result
 	commandline -f repaint
 end
-bind \er fzf-cdhist-widget
+# bind \er fzf-cdhist-widget
+bind -m insert z fzf-cdhist-widget