From 58f0145f5a3ed06c9f2408a16329a972dcd79d24 Mon Sep 17 00:00:00 2001
From: Joshua Yuen <joshuayuen99@gmail.com>
Date: Sat, 30 Aug 2025 17:05:25 -0400
Subject: [PATCH] Use more Nix-friendly fzf zsh integration

---
 modules/core/user.nix        |  2 +-
 modules/home/default.nix     |  1 +
 modules/home/fzf.nix         | 10 ++++++++++
 modules/home/zsh/default.nix |  6 ------
 4 files changed, 12 insertions(+), 7 deletions(-)
 create mode 100644 modules/home/fzf.nix

diff --git a/modules/core/user.nix b/modules/core/user.nix
index 2ea26d5..057fa5e 100644
--- a/modules/core/user.nix
+++ b/modules/core/user.nix
@@ -45,7 +45,7 @@ in
     shell = pkgs.${shellCfg.defaultShell};
     ignoreShellProgramCheck = true;
     packages = with pkgs; [
-      fzf
+      
     ];
   };
 
diff --git a/modules/home/default.nix b/modules/home/default.nix
index d1d8e73..525d252 100644
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -4,6 +4,7 @@
 {
   imports = [
     ./direnv.nix
+    ./fzf.nix
     ./hyprland
     ./kitty.nix
     ./overlays.nix
diff --git a/modules/home/fzf.nix b/modules/home/fzf.nix
new file mode 100644
index 0000000..95df56e
--- /dev/null
+++ b/modules/home/fzf.nix
@@ -0,0 +1,10 @@
+{
+  ...
+}:
+{
+  programs.fzf = {
+    enable = true;
+    enableBashIntegration = true;
+    enableZshIntegration = true;
+  };
+}
diff --git a/modules/home/zsh/default.nix b/modules/home/zsh/default.nix
index f02cd89..e782b2c 100644
--- a/modules/home/zsh/default.nix
+++ b/modules/home/zsh/default.nix
@@ -54,12 +54,6 @@ in
       # Control arrow keys
       bindkey '^[[1;5C' forward-word
       bindkey '^[[1;5D' backward-word
-
-      # Load fzf keybindings
-      if [ -n "''${commands[fzf-share]}" ]; then
-        source "$(fzf-share)/key-bindings.zsh";
-        source "$(fzf-share)/completion.zsh";
-      fi
     '';
 
     shellAliases = {