diff --git a/homes/x86_64-linux/rafiq/default.nix b/homes/x86_64-linux/rafiq/default.nix
index 9c8a5ed..f84b98f 100644
--- a/homes/x86_64-linux/rafiq/default.nix
+++ b/homes/x86_64-linux/rafiq/default.nix
@@ -2,6 +2,7 @@
 {
   cli = {
     shell = "zsh";
+    finder = "fzf";
     screensaver.enable = true;
     screensaver.timeout = "100";
     screensaver.command = "cbonsai -S -w 0.1 -L 40 -M 2 -b 2";
@@ -39,9 +40,5 @@
       enable = true;
       nix-direnv.enable = true;
     };
-    fzf = {
-      enable = true;
-      enableZshIntegration = true;
-    };
   };
 }
diff --git a/modules/home/cli/default.nix b/modules/home/cli/default.nix
index b4b5b43..80caca5 100644
--- a/modules/home/cli/default.nix
+++ b/modules/home/cli/default.nix
@@ -7,6 +7,7 @@
 {
   options.cli = {
     shell = lib.pantheon.mkStrOption;
+    finder = lib.pantheon.mkStrOption;
     screensaver.enable = lib.mkEnableOption "";
     screensaver.timeout = lib.pantheon.mkStrOption;
     screensaver.command = lib.pantheon.mkStrOption;
diff --git a/modules/home/cli/finder/default.nix b/modules/home/cli/finder/default.nix
new file mode 100644
index 0000000..894cbc1
--- /dev/null
+++ b/modules/home/cli/finder/default.nix
@@ -0,0 +1,11 @@
+{ config, lib, ... }:
+{
+  config = lib.mkMerge [
+    (lib.mkIf (config.cli.finder == "fzf") {
+      programs.fzf = {
+        enable = true;
+        enableZshIntegration = lib.mkIf (config.cli.shell == "zsh") true;
+      };
+    })
+  ];
+}