diff --git a/.config/fish/conf.d/20-gpg.fish b/.config/fish/conf.d/20-gpg.fish
index da9be65..d5bd1f8 100644
--- a/.config/fish/conf.d/20-gpg.fish
+++ b/.config/fish/conf.d/20-gpg.fish
@@ -1,3 +1,6 @@
 #!/usr/bin/env fish
 
-set -gx GPG_TTY (tty)
+if test command -v gpgconf &>/dev/null
+    set -gx GPG_TTY (tty)
+    gpgconf --launch gpg-agent
+end
diff --git a/.config/fish/functions/fzf.fish b/.config/fish/functions/fzf.fish
new file mode 100644
index 0000000..f64d606
--- /dev/null
+++ b/.config/fish/functions/fzf.fish
@@ -0,0 +1,9 @@
+#!/usr/bin/env fish
+
+function fzf --wraps=fzf
+    if test "$TERM_PROGRAM" = tmux
+        fzf-tmux -p 90%,95% $argv
+    else
+        fzf $argv
+    end
+end