diff --git a/nix/home.nix b/nix/home.nix
index 9994ebb..5d5916b 100644
--- a/nix/home.nix
+++ b/nix/home.nix
@@ -20,7 +20,6 @@
     duf
     # Better top
     htop
-    fzf
     ncdu
     ripgrep
     tmux
diff --git a/nix/modules/fish/default.nix b/nix/modules/fish/default.nix
index 54ca9d2..18660de 100644
--- a/nix/modules/fish/default.nix
+++ b/nix/modules/fish/default.nix
@@ -6,9 +6,22 @@
     options = ["--cmd j"];
   };
 
+  programs.fzf = {
+    enable = true;
+    enableFishIntegration = false;
+  };
+
   programs.fish = {
     enable = true;
 
+    plugins = [
+      {
+        # https://github.com/PatrickF1/fzf.fish
+        name = "fzf";
+        src = pkgs.fishPlugins.fzf-fish.src;
+      }
+    ];
+
     shellInit = ''
       set --universal fish_greeting
       set -g -x EDITOR "emacsclient"
@@ -21,6 +34,8 @@
 
       # TODO - Adjust for nix-managed Doom if I ever do that
       fish_add_path ~/.emacs.d/bin
+
+      fzf_configure_bindings --history=\cr --directory=\ef --git_status=\es
       '';
 
     shellAliases = {