fix pass and fzf completions

1 files changed, 10 insertions, 23 deletions

diff --git a/bash/.bashrc b/bash/.bashrc
index 40d90ef..f76b1d9 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -246,29 +246,9 @@ fi
 #######
 
 # FZF
-
-## Void
-if [ -f /usr/share/fzf/completion.bash ]; then
-    . /usr/share/fzf/completion.bash
-    . /usr/share/fzf/key-bindings.bash
-fi
-## Debian
-if [ -f /usr/share/doc/fzf/examples/completion.bash ]; then
-    # For apt install fzf
-    . /usr/share/doc/fzf/examples/completion.bash
-    . /usr/share/doc/fzf/examples/key-bindings.bash
-fi
-
-## OS X/homebrew
-if [ -f /opt/homebrew/opt/fzf/shell/completion.bash ]; then
-    . /opt/homebrew/opt/fzf/shell/completion.bash
-    . /opt/homebrew/opt/fzf/shell/key-bindings.bash
-fi
-
-## OpenBSD
-if [ -f /usr/local/share/fzf/bash/key-bindings.bash ]; then
-    . /usr/local/share/fzf/bash/key-bindings.bash
-    . /usr/local/share/fzf/bash/completion.bash
+FZF=`which fzf 2> /dev/null`
+if [ -x "$FZF" ]; then
+    eval "$(fzf --bash)"
 fi
 
 ## TCL/TK via homebrew
@@ -278,6 +258,13 @@ if [ -d /opt/homebrew/opt/tcl-tk/bin ]; then
     PATH=/opt/homebrew/opt/tcl-tk/bin:$PATH
 fi
 
+# password-store completions
+if [ -f /usr/local/share/bash-completion/completions/pass ]; then
+    source /usr/local/share/bash-completion/completions/pass
+fi
+if [ -f /usr/local/share/bash-completion/completions/pass-otp ]; then
+    source /usr/local/share/bash-completion/completions/pass-otp
+fi
 #######
 
 #TERM="xterm-256color"