From 96b467b7ed497661c315f9248dd9b83d80745ad3 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Fri, 25 Jul 2025 22:15:21 +0100
Subject: [PATCH] Move fzf configuration

---
 home-manager/opdavies/PW05CH3L.nix |  2 --
 home-manager/opdavies/nixedo.nix   |  1 -
 home-manager/opdavies/t480.nix     |  2 --
 modules/home-manager/default.nix   |  1 -
 modules/home-manager/fzf.nix       | 21 ---------------------
 modules2/fzf/enable.nix            |  6 ++++++
 modules2/fzf/session-variables.nix |  5 +++++
 7 files changed, 11 insertions(+), 27 deletions(-)
 delete mode 100644 modules/home-manager/fzf.nix
 create mode 100644 modules2/fzf/enable.nix
 create mode 100644 modules2/fzf/session-variables.nix

diff --git a/home-manager/opdavies/PW05CH3L.nix b/home-manager/opdavies/PW05CH3L.nix
index dcd94faf..5ed05f48 100644
--- a/home-manager/opdavies/PW05CH3L.nix
+++ b/home-manager/opdavies/PW05CH3L.nix
@@ -7,8 +7,6 @@
     cli = {
       bookmarkthis.enable = true;
       direnv.enable = true;
-      fzf.enable = true;
-
       node.enable = true;
       ranger.enable = true;
       starship.enable = true;
diff --git a/home-manager/opdavies/nixedo.nix b/home-manager/opdavies/nixedo.nix
index 8b423f76..91959735 100644
--- a/home-manager/opdavies/nixedo.nix
+++ b/home-manager/opdavies/nixedo.nix
@@ -8,7 +8,6 @@
   ];
 
   features.cli = {
-    fzf.enable = true;
     starship.enable = true;
     zsh.enable = true;
   };
diff --git a/home-manager/opdavies/t480.nix b/home-manager/opdavies/t480.nix
index 8c706cd7..9d855bb7 100644
--- a/home-manager/opdavies/t480.nix
+++ b/home-manager/opdavies/t480.nix
@@ -11,8 +11,6 @@
       bluetuith.enable = true;
       bookmarkthis.enable = true;
       direnv.enable = true;
-      fzf.enable = true;
-
       node.enable = true;
 
       ranger.enable = true;
diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
index f9ca2742..2308c22b 100644
--- a/modules/home-manager/default.nix
+++ b/modules/home-manager/default.nix
@@ -8,7 +8,6 @@
     ./dev-commit.nix
     ./direnv.nix
     ./flameshot.nix
-    ./fzf.nix
     ./gnupg.nix
     ./gtk.nix
     ./media/handbrake.nix
diff --git a/modules/home-manager/fzf.nix b/modules/home-manager/fzf.nix
deleted file mode 100644
index aae36ec1..00000000
--- a/modules/home-manager/fzf.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ config, lib, ... }:
-
-with lib;
-
-let
-  cfg = config.features.cli.fzf;
-in
-{
-  options.features.cli.fzf.enable = mkEnableOption "Enable fzf";
-
-  config = mkIf cfg.enable {
-    programs.fzf = {
-      enable = true;
-      enableZshIntegration = true;
-    };
-
-    home.sessionVariables = {
-      FZF_DEFAULT_OPTS = "--reverse";
-    };
-  };
-}
diff --git a/modules2/fzf/enable.nix b/modules2/fzf/enable.nix
new file mode 100644
index 00000000..512d9727
--- /dev/null
+++ b/modules2/fzf/enable.nix
@@ -0,0 +1,6 @@
+{
+  flake.modules.homeManager.base.programs.fzf = {
+    enable = true;
+    enableZshIntegration = true;
+  };
+}
diff --git a/modules2/fzf/session-variables.nix b/modules2/fzf/session-variables.nix
new file mode 100644
index 00000000..cb3e2433
--- /dev/null
+++ b/modules2/fzf/session-variables.nix
@@ -0,0 +1,5 @@
+{
+  flake.modules.homeManager.base.home.sessionVariables = {
+    FZF_DEFAULT_OPTS = "--reverse";
+  };
+}