From 49d46a30f916ca4dbca58d26b824b8094edd8094 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.dev>
Date: Sat, 5 Apr 2025 09:00:00 +0100
Subject: [PATCH] Extract a fzf mixin

---
 hosts/PW05CH3L/configuration.nix     |  1 +
 hosts/t480/configuration.nix         |  1 +
 modules/home-manager/cli/default.nix |  1 -
 modules/home-manager/cli/fzf.nix     | 10 ----------
 modules/mixins/fzf.nix               | 12 ++++++++++++
 5 files changed, 14 insertions(+), 11 deletions(-)
 delete mode 100644 modules/home-manager/cli/fzf.nix
 create mode 100644 modules/mixins/fzf.nix

diff --git a/hosts/PW05CH3L/configuration.nix b/hosts/PW05CH3L/configuration.nix
index 589ab6c1..cf014e0e 100644
--- a/hosts/PW05CH3L/configuration.nix
+++ b/hosts/PW05CH3L/configuration.nix
@@ -4,6 +4,7 @@
   imports = [
     ../../modules/mixins/direnv.nix
     ../../modules/mixins/docker.nix
+    ../../modules/mixins/fzf.nix
     ../../modules/mixins/phpactor
 
     ../common
diff --git a/hosts/t480/configuration.nix b/hosts/t480/configuration.nix
index 85cd3ae8..b0ebc183 100644
--- a/hosts/t480/configuration.nix
+++ b/hosts/t480/configuration.nix
@@ -12,6 +12,7 @@
     ../../modules/mixins/bluetooth.nix
     ../../modules/mixins/direnv.nix
     ../../modules/mixins/docker.nix
+    ../../modules/mixins/fzf.nix
     ../../modules/mixins/phpactor
     ../../modules/mixins/pipewire.nix
     ../../modules/mixins/thunar.nix
diff --git a/modules/home-manager/cli/default.nix b/modules/home-manager/cli/default.nix
index eb6e3794..cb8575d8 100644
--- a/modules/home-manager/cli/default.nix
+++ b/modules/home-manager/cli/default.nix
@@ -3,7 +3,6 @@
 {
   imports = [
     ./bin
-    ./fzf.nix
     ./git.nix
     ./neovim
     ./newsboat
diff --git a/modules/home-manager/cli/fzf.nix b/modules/home-manager/cli/fzf.nix
deleted file mode 100644
index 23795361..00000000
--- a/modules/home-manager/cli/fzf.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  programs.fzf = {
-    enable = true;
-    enableZshIntegration = true;
-  };
-
-  home.sessionVariables = {
-    FZF_DEFAULT_OPTS = "--reverse";
-  };
-}
diff --git a/modules/mixins/fzf.nix b/modules/mixins/fzf.nix
new file mode 100644
index 00000000..524c7196
--- /dev/null
+++ b/modules/mixins/fzf.nix
@@ -0,0 +1,12 @@
+{
+  home-manager.users.opdavies = {
+    programs.fzf = {
+      enable = true;
+      enableZshIntegration = true;
+    };
+
+    home.sessionVariables = {
+      FZF_DEFAULT_OPTS = "--reverse";
+    };
+  };
+}